Fixing conflicts in Git with –theirs or –ours

I often have changes I want to ditch, and just accept whatever is in the branch I’m merging. For that case, you can use git checkout –theirs PATH/FILE (or –ours if you’re overriding).

https://rtcamp.com/tutorials/git/git-resolve-merge-conflicts/

Advertisements

Leave a Reply

Fill in your details below or click an icon to log in:

WordPress.com Logo

You are commenting using your WordPress.com account. Log Out / Change )

Twitter picture

You are commenting using your Twitter account. Log Out / Change )

Facebook photo

You are commenting using your Facebook account. Log Out / Change )

Google+ photo

You are commenting using your Google+ account. Log Out / Change )

Connecting to %s