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

14 votes250 views4 answers
Postgresql
Shell/Bash
0 vote283 views1 answer
Voice recorder in linux
Shell/Bash
0 vote275 views1 answer
How to reduce slug size heroku
Shell/Bash
0 vote283 views1 answer
React-github-contribution-calendar
Shell/Bash
1 vote248 views1 answer
Linux bring process to foreground
Shell/Bash
63 votes259 views6 answers
How to install react router
Shell/Bash
0 vote253 views3 answers
Install gitlab-ce on centos
Shell/Bash
3 votes281 views2 answers
Pm2 remove id
Shell/Bash
5 votes263 views3 answers
Netstat check port
Shell/Bash
3 votes257 views2 answers
Exit telnet
Shell/Bash