News for hackers. Stuff that matters.

A comment on A Git catastrophe cleaned up. Parent comment

Re:A Git catastrophe cleaned up by Ajedi32 on Wednesday December 21, 2016 @11:50AM (#13230555)
Nothing. The author stated though that the merge had to be done:

> without losing the commit history and messages

Otherwise a "partial checkin" (which was exactly what "co-worker X" did) would have worked fine.

[ Parent | on HN ]
Re:A Git catastrophe cleaned up by ksk on Wednesday December 21, 2016 @12:37PM (#13230936)
Ah okay, my bad.. I was mis-reading the article. I get it now. The topic branch commit history where the co-worker built up the branch would be lost if you just tacked on the leaf node to the master branch..
[ Parent | on HN ]