Skip to content

Instantly share code, notes, and snippets.

@arjunKumbakkara

arjunKumbakkara/GitMergeManualSteps

Created October 12, 2020 05:01
Show Gist options
  • Save arjunKumbakkara/8b8487625fc3a2ee62e1c69ee1b1427b to your computer and use it in GitHub Desktop.
Save arjunKumbakkara/8b8487625fc3a2ee62e1c69ee1b1427b to your computer and use it in GitHub Desktop.
Download ZIP
Git Merge Process (Manual with IDE and without Meld,kraken etc)
Raw
GitMergeManualSteps
Git Merge Process (Manual with IDE and without Meld,kraken etc)Final Steps :
1. Be in Master : git checkout master
2. git pull
3. git checkout new-branch
4. git pull
5. git checkout master
6. git merge new- branch
Conflicts in IDE / fix them .
7.Change conflicts in eclipse if
8.Git status /add /commit /push
Done!
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment