Skip to content

Instantly share code, notes, and snippets.

@Epigene

Epigene/merge_conflick_ours

Created July 29, 2014 11:53
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 Epigene/94ef86d061d35fc70e9d to your computer and use it in GitHub Desktop.
Save Epigene/94ef86d061d35fc70e9d to your computer and use it in GitHub Desktop.
Download ZIP
Kā mergot ņemot lokālo versiju kā dominējošo konfliktu gadījumā
Raw
merge_conflick_ours
git fetch
git merge
git checkout --ours . # checkout our local version of all files
git add -u # mark all conflicted files as merged
git commit -am "Successful merge" # commit the merge
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment