News for hackers. Stuff that matters.
Re:Oh shit, git: Getting myself out of bad situations by Yokohiii on Monday December 18, 2017 @01:34PM (#15953996)
That sounds quite chaotic and impossible to keep stable. I wonder who was responsible to find problems and fix the master after messing up?
Re:Oh shit, git: Getting myself out of bad situations by swalsh on Tuesday December 19, 2017 @10:21AM (#15960776)
It was actually quite clean, and the environment was extremely stable. The trick is, every commit was "self-contained". Reverting it would go to another previous stable version. Creating a self-contained commit can be done many ways, and rebase is one common tool used to do it. Another is the use of git merge with --squash and a cherry-pick.