Skip to content

Instantly share code, notes, and snippets.

@hervispichardo

hervispichardo/git-secure-merge-and-compare

Last active September 27, 2019 15:20
Show Gist options
  • Save hervispichardo/4eb5167a2bf18773948897752bd4b5f0 to your computer and use it in GitHub Desktop.
Save hervispichardo/4eb5167a2bf18773948897752bd4b5f0 to your computer and use it in GitHub Desktop.
Download ZIP
Git secure merge
Raw
git-secure-merge-and-compare
git checkout feature_branch
git merge -s ours --no-commit master
git commit # Add a message regarding the replacement that you just did
git checkout master
git merge feature_branch
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment