Skip to content

Instantly share code, notes, and snippets.

@MikaelElkiaer

MikaelElkiaer/checkout_ours.sh

Created January 7, 2020 14:20
Show Gist options
  • Star 0 You must be signed in to star a gist
  • Fork 0 You must be signed in to fork a gist
  • Save MikaelElkiaer/a1780620c5913135bb956da098714add to your computer and use it in GitHub Desktop.
Save MikaelElkiaer/a1780620c5913135bb956da098714add to your computer and use it in GitHub Desktop.
Download ZIP
Git checkout ours for merge conflict
Raw
checkout_ours.sh
#!/bin/sh
fzf | xargs -I {} -r git checkout --ours -- {}
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment