Stories
Slash Boxes
Comments
NOTE: use Perl; is on undef hiatus. You can read content, but you can't post it. More info will be forthcoming forthcomingly.

All the Perl that's Practical to Extract and Report

use Perl Log In

Log In

[ Create a new account ]

jdavidb (1361)

jdavidb
  (email not shown publicly)
http://voiceofjohn.blogspot.com/

J. David Blackstone has a Bachelor of Science in Computer Science and Engineering and nine years of experience at a wireless telecommunications company, where he learned Perl and never looked back. J. David has an advantage in that he works really hard, he has a passion for writing good software, and he knows many of the world's best Perl programmers.

Journal of jdavidb (1361)

Thursday October 15, 2009
12:55 PM

Instructions: in the middle of a git rebase conflict

[ #39759 ]

So you've done a git rebase, and a conflict was reported.

The instructions you originally received (which have long since scrolled off your screen), were:

Failed to merge in the changes.
Patch failed at 0051.

When you have resolved this problem run "git rebase --continue".
If you would prefer to skip this patch, instead run "git rebase --skip".
To restore the original branch and stop rebasing run "git rebase --abort".

Thankfully, I can usually remember the --abort switch.

What you haven't been told is:

To get a list of files with conflicts from git, instead of trying to use ack and stuff and picking up false positives:

git status 2>&1 | grep 'needs merge'

After correcting a file with a conflict:

git add FILE

After all the files are added, run a git --rebase continue, without doing a git commit (just in case there was any confusion, and there usually is, for me).

There are a number of other "in the middle of a git conflict" situations that I encounter, none of which are handled the same way, and I hope in time to produce a complete series of instruction cheat sheets for them.

The Fine Print: The following comments are owned by whoever posted them. We are not responsible for them in any way.
 Full
 Abbreviated
 Hidden
More | Login | Reply
Loading... please wait.