masdeseiscaracteres/merge_conflicts.md

Last active September 18, 2023 14:46

Star (0) You must be signed in to star a gist
Fork (0) You must be signed in to fork a gist

Learn more about clone URLs
Clone this repository at <script src="https://gist.github.com/masdeseiscaracteres/4b0fe924ca0ab8f626fa2c42099e46cb.js"></script>
Save masdeseiscaracteres/4b0fe924ca0ab8f626fa2c42099e46cb to your computer and use it in GitHub Desktop.

Download ZIP

Solving git conflicts

Raw

merge_conflicts.md

Keep target/current branch changes: git checkout --ours my/file.ext
Keep contributing branch changes: git checkout --theirs my/file.ext

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