Merge conflict

Issues Merging the Pull Request

Merge conflict

This pull request has conflicts.

You must resolve the conflicts before you can merge:

1. Step 1: Fetch the changes (saving the target branch as FETCH_HEAD).

    git fetch origin master
   

2. Step 2: Checkout the source branch and merge in the changes from the target branch. Resolve conflicts.

    git checkout test/test 
    git merge FETCH_HEAD
   

3. Step 3: After the merge conflicts are resolved, stage the changes accordingly, commit the changes and push.

    git commit
    git push origin HEAD
   

4. Step 4: Merge the updated pull request.