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

0 vote79 views1 answer
How to deploy firebase application in raspberry
Shell/Bash
0 vote125 views1 answer
How to install ros package
Shell/Bash
0 vote126 views1 answer
List node root packages installed
Shell/Bash
0 vote121 views1 answer
Batch file path
Shell/Bash
2 votes181 views1 answer
Add rule ubuntu firewall
Shell/Bash
1 vote142 views1 answer
React hook install
Shell/Bash
0 vote117 views1 answer
Suse linux update
Shell/Bash
28 votes77 views1 answer
Php artisan migrate rollback step 1
Shell/Bash
10 votes114 views3 answers
! [rejected] master -> master (fetch first) error: failed to push some refs to 'https://github.com/Armandres30/Xpath.git'
Shell/Bash
10 votes109 views3 answers
Git remove file from commit
Shell/Bash