[Libreoffice] newish to git: howto recover from bad merge?

Kevin Hunter hunteke at earlham.edu
Fri Nov 19 06:27:15 PST 2010

At 7:23am -0500 Fri, 19 Nov 2010, Michael Meeks wrote:
> Yes - I too fall over this dumb thing every time as well; you cannot
> 'git add' and 'git commit' the file if it is identical to the
> original :-) Sometimes I cheat by doing some trivial whitespace change
> (which is no doubt evil ;-). I -believe- if there are no changes after
> the edit you want to do:
> 	git rebase --skip

Thanks to everyone for there help, but this was the solution of them all 
that worked.  (Thank you Takeshi, for the conceptual understanding. 
That also helped from a different standpoint.)


More information about the LibreOffice mailing list