Merge branch A to branch B - TopBrussels/DisplacedTops GitHub Wiki
Make sure local and remote reps in branch A are the same:
git checkout <branch A>
git status
git add/rm <filename>
git commit -m ""
git push
Change the branch and merge
git checkout <branch B>
git merge <branch A>
resolve all conflicts: (git tries to auto-merge changes but this is not always possible.
Some conflicts need to be merged manually by editing the files shown by git)
git add <filename>
if you forget to add/rm the files after the merge you will get error:
'commit' is not possible because you have unmerged files
git commit -m “”
git push
Before merging changes, you can also preview them by using:
git diff <branch A> <branch B>