Skip to content

Instantly share code, notes, and snippets.

@albertpark

albertpark/ignore-files-during-git-merge.md

Created May 16, 2020 19:15
Show Gist options
  • Save albertpark/d248894b828ff3e970ff655d372dfe8e to your computer and use it in GitHub Desktop.
Save albertpark/d248894b828ff3e970ff655d372dfe8e to your computer and use it in GitHub Desktop.
Download ZIP
Raw
ignore-files-during-git-merge.md

Ignore Files During Git Merge

→ $ git merge --no-ff --no-commit <merge-branch>
→ $ git reset HEAD ignorefilemerge.txt
→ $ git checkout -- ignorefilemerge.txt
→ $ git commit -m "merged <merge-branch>"

https://stackoverflow.com/a/16455853

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment