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

1 vote176 views1 answer
Git diff between one file
Shell/Bash
4 votes165 views2 answers
Centos install composer
Shell/Bash
0 vote266 views2 answers
Dash bootstrap install
Shell/Bash
0 vote174 views1 answer
Linux add homedir
Shell/Bash
0 vote168 views1 answer
Linux check docker version
Shell/Bash
-1 vote165 views2 answers
Install composer in dockerfile
Shell/Bash
20 votes167 views4 answers
Uninstall dependencies yarn
Shell/Bash
1 vote177 views1 answer
Bash move a list of files
Shell/Bash
0 vote176 views1 answer
Do-release-upgrade
Shell/Bash
5 votes247 views1 answer
Linux bookmark comands
Shell/Bash