git.md

to merge 2 branches: in my branch git fetch go other-branch git rebase go mybranch git merge --no-ff other-branch merge conflicts git add git commit git push