News for hackers. Stuff that matters.
Re:Five advanced Git merge techniques by trust-me on Saturday March 30, 2013 @11:20PM (#5467565)
Ufff, I must be doing something very wrong. Once in a while rebase continue will just fail with cryptic error messages and nothing but a hard reset will let me continue using the repository. Never had a problem with regular git pull.
Re:Five advanced Git merge techniques by X-Istence on Sunday March 31, 2013 @02:37AM (#5467928)
What are the cryptic error messages?

The only one that I know if is the message stating that the commit is empty ...

In that case simple use git rebase --skip, to skip applying that patch. That tends to happen when after you fix the "merge" conflict after replaying a patch and the changeset is empty.

Re:Five advanced Git merge techniques by MBlume on Sunday March 31, 2013 @02:37AM (#5467930)
If you're really having trouble using git rebase the escape hatch is git rebase --abort