This is just a note for myself and anyone who understands.
If you are working from a branch, do a git checkout to the branch that gets merge conflicts. Do a git pull. Then do a git merge/origin/branchname . Do a git commit. Escape the section showed with Esc on Windows, do a Shift ; and enter wq . Afterwards do a git push origin conflictingbranch. In my place, I had to do it for the staging branch.
Do the git commit after you have fixed the conflict in the file. The differences are between something like HEAD and ==== and another line that separates the merge conflict sections
ReplyDelete