When git-am fails to apply

When git-am fails to apply a patch, then

git-am --3way

will cause it to try a 3-way merge. This lets you manually edit the conflicted sections before running git-add for the conflicted files, and

git-am --resolved 

to move to the next patch.  Of course, sometimes it’s able to do the merge and you don’t have to do anything!  Thanks – http://home.regit.org/?page_id=32

This entry was posted in Uncategorized. Bookmark the permalink.

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