Skip to content

Instantly share code, notes, and snippets.

@SebSept

SebSept/fix_mege_conflicts.sh

Created October 1, 2021 07:52
Show Gist options
  • Save SebSept/b73055536a7a472df39ac7ccd549bafd to your computer and use it in GitHub Desktop.
Save SebSept/b73055536a7a472df39ac7ccd549bafd to your computer and use it in GitHub Desktop.
Download ZIP
This branch has conflicts that must be resolved
Raw
fix_mege_conflicts.sh
git checkout master
git pull
git checkout <branch>
git merge master
# [ ... resolve any conflicts ... ]
git add [files that were conflicted]
git commit
git push
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment