Skip to content
Tags

,

October 17, 2012

Sometimes, when you want to merge a conflict, you don’t need to taylor a solution based on the conflict… you just want to pick either ‘our’ solution or ‘their’ solution for a file.

To do that use

> git checkout –ours <filename>

or

> git checkout –theirs <filename>

Advertisements

From → Uncategorized

Leave a Comment

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

%d bloggers like this: