Git repository branch merge

When you try to merge two branches, It does not require any PullRequest to do the task. Internal repository code merge can be done using local .

Even we can do the pull request using one the repository console link. But I may be end up with the conflict error. Be conscious on what you gonna do. You may not get option to resolve it on the online editor.

Need to know how to do, You have to follow this steps.

1) Go to  repository location
2) Project1<REL-2.0.X> $ git pull
3) Project1<REL-2.0.X> $ git merge REL-1.7.X  
4) Destination <-- Source

Source is 2.0 and destination 1.7 (Don't be confused with this repository versions).
Finally you will get the all source code changes on 1.7 version will be available on the 2.0.

If you done some mistake during this merge, follow this to revert.
(Get the merge commit version)

git revert -m 1 26a0837
git push
(Note :  1 is first parent, and 26a0837 is commit id.)