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 vote182 views1 answer
Move file from one directory to another sftp
Shell/Bash
0 vote209 views1 answer
Tar: Cowardly refusing to create an empty archive
Shell/Bash
28 votes194 views5 answers
Git stash save untracked
Shell/Bash
23 votes185 views2 answers
Brew not found
Shell/Bash
20 votes197 views4 answers
Git flow hotfix
Shell/Bash
11 votes192 views2 answers
Check upstream branch git
Shell/Bash
0 vote192 views1 answer
Setup github password terminal
Shell/Bash
1 vote177 views1 answer
Chmod files 644 directories 755
Shell/Bash
3 votes193 views1 answer
Ubuntu apt-get update without input
Shell/Bash
7 votes298 views2 answers
How to revert back to previous commit in git permanently
Shell/Bash