Skip to content

Instantly share code, notes, and snippets.

@antpaw

antpaw/git.sh

Created May 6, 2024 11:53
Show Gist options
  • Save antpaw/a68fc5c497ae51ce0f252aff1148d939 to your computer and use it in GitHub Desktop.
Save antpaw/a68fc5c497ae51ce0f252aff1148d939 to your computer and use it in GitHub Desktop.
Download ZIP
Bulk merge
Raw
git.sh
# Accept the remote version for all conflicting files with:
git rebase --strategy-option theirs
# Alternatively, to accept the local version for all conflicting files, use:
git rebase --strategy-option ours
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment