News for hackers. Stuff that matters.
Re:Git pretty by pjungwir on Saturday September 06, 2014 @09:58PM (#8280098)
I've read that doc and other warnings about reverting a merge. But I've found that if you revert the revert, then you avoid the problems they mention. I guess the worry is that you still have to remember to do that, or you'll have commits that silently never merge. But if you do remember, then reverting the revert makes things okay. But I'm no expert. Can anyone else confirm this for me?
Re:Git pretty by bobthecow on Saturday September 06, 2014 @11:09PM (#8280226)
Yes, the correct way to do it is to revert the revert. js2's link above outlines how and why in detail.