Branch conflicts

git checkout master
git pull
git checkout <branch>
git merge master
[ ... resolve any conflicts ... ]
git add [files that were conflicted]
git commit
git push

Source: stackoverflow.com

Similar codes

37 votes187 views5 answers
Git abort merge
Shell/Bash
1 vote187 views1 answer
Github ssh test
Shell/Bash
0 vote188 views1 answer
Catch grep cat last first lines of a file linux
Shell/Bash
3 votes186 views1 answer
How to install nbextensions in jupyter python notebook on anaconda
Shell/Bash
1 vote198 views1 answer
Ubuntu vs lubuntu
Shell/Bash
0 vote185 views1 answer
Cd n directories back
Shell/Bash
0 vote239 views1 answer
Xrdp choose desktop environment
Shell/Bash
0 vote200 views1 answer
Install jupyter notebbok in pip
Shell/Bash
0 vote239 views1 answer
Wifi driver
Shell/Bash
2 votes190 views3 answers
Ping command not found
Shell/Bash