Skip to content

Instantly share code, notes, and snippets.

@alikrc

alikrc/git merge source vs target

Created April 15, 2019 11:45
Show Gist options
  • Save alikrc/7745e349dcacaac79693126b51a39a30 to your computer and use it in GitHub Desktop.
Save alikrc/7745e349dcacaac79693126b51a39a30 to your computer and use it in GitHub Desktop.
Download ZIP
Raw
git merge source vs target
SOURCE: remote
Target: Mine
https://blogs.endjin.com/2014/06/using-git-for-net-development-part-4-resolving-merge-conflicts/
Copy link

ghost commented Sep 25, 2020 •
edited by ghost
Loading

This really helped, thank you for keeping it here. 😄

@alikrc
Copy link
Author

alikrc commented Sep 25, 2020

This really helped, thank you for keeping it here. 😄

Glad to help 😄

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