Note Resolving Merge Conflicts on Git

When the master branch is ahead of the feature branch, we need to resolve some conflicts when we merge the feature branch to the master branch.

git pull origin X

X is your main/master branch, ie. `development` or master

git pull origin development

Then VS code might show the files that have merge conflicts, search “=====” in VS code to locate all these conflicts

choose “accept incoming change” if that is what you want

git add .
git status 

to verify all the conflicts resolved

git commit -m "CORE-419: resolved merge conflict"

“CORE-419” is just an example, the commit message can be customized.

git push
git log

check the logs

👏Wanna support me and become a medium member? Click here.