Re: Re: Poltergeists breaking code while I'm off working on different chun
By: Tracker1 to Khelair on Wed May 27 2015 00:31:15
I'm not the best with git myself... when I follow a "git workflow" with shor lived branches, and rebase often, I tend to have better luck... in general, unless you rebase, squash commits, and push with a --force, it's nearly impossible to lose something you've pushed to a remote repository.
Well, I managed to look up a good tutorial on git bisect that really
helped me get a lot closer to the point I need to restore some chunks from in my code. As much as I hate its little rituals and needing to make sure that the chicken bones form the pentagram on the right night of the moon's phase, it's got some power and usefulness behind it that make the arcane crap rather worth using, IMO. Bisect is the most powerful tool that I've found with it
so far, and I can see that I'm going to be using it a lot more in the future. If I would've bothered to learn some more about it a few months ago it would've saved me actual weeks, if not a few months, of development time when different feature sets broke from different people's commits.
That being said, a little bit more green level documentation would
really be nice for it. ;)
I'm just starting to learn about the rebasing, squashing commits, and I'm just trying to stay away from the --force tag. I commit all the time (a little bit too often-- my issues with bisect have now taught me to at least do a syntax checking run before I commit each time in order to help trackign down problems more efficiently), and I've thought about squashing some commits, but I don't think I'm going to bother with that until I know I'm at a good tagged beta version. I can see the potential for bogus there.
Thanks for the well wishes. :) I've got the commits annotated, just need to run through and do a diff and merge some stuff up to HEAD now and I should have a copy with everything working that I've had working for quite awhile now. :) All at once this time, even! ;)
Best wishes!
-K
---
Borg Burgers: We do it our way; your way is irrelevant.
þ Synchronet þ Tinfoil Tetrahedron BBS
telnet://tinfoil.synchro.net