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

3 votes216 views2 answers
How to exit telnet linux
Shell/Bash
0 vote198 views1 answer
Solidity optimizer runs
Shell/Bash
0 vote213 views2 answers
Js code for webpage download progress bar
Shell/Bash
8 votes213 views4 answers
Ffmpeg mkv to mp4
Shell/Bash
3 votes195 views2 answers
Magento 2 version file permissions
Shell/Bash
24 votes199 views4 answers
Uncompress tar.xz linux
Shell/Bash
17 votes213 views6 answers
Install mongo db ubuntu
Shell/Bash
0 vote213 views1 answer
Install dropbox ubuntu
Shell/Bash
0 vote204 views1 answer
Get linux distro from terminal
Shell/Bash
9 votes210 views2 answers
How to zip and unzip tar
Shell/Bash