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 vote234 views1 answer
Generate pkcs12 certificate using keytool
Shell/Bash
40 votes233 views6 answers
Git command
Shell/Bash
0 vote249 views1 answer
Dockerd failed to start daemon: failed to get temp dir to generate runtime scripts
Shell/Bash
0 vote233 views1 answer
Fibre device linux
Shell/Bash
1 vote220 views1 answer
Install lutris kali linux
Shell/Bash
1 vote231 views4 answers
Reset postgres password windows
Shell/Bash
172 votes242 views6 answers
Nodemon installation
Shell/Bash
3 votes215 views1 answer
Install godot ubuntu
Shell/Bash
63 votes242 views2 answers
How to remove remote origin from git repo
Shell/Bash
0 vote242 views1 answer
Run same command in different hosts
Shell/Bash