[Development] gerrit : using branches (was: pointers to use it cleverly/efficiently?)
René J.V. Bertin
rjvbertin at gmail.com
Wed Mar 30 17:00:20 CEST 2016
On Wednesday March 30 2016 12:54:30 Welbourne Edward wrote:
>René J.V. Bertin said:
>> I've got a few things I'd like to put up for code review, which I've
>> been putting off because I can only think of doing them either one by
Thanks for such a lengthy and detailed overview - I hope you had that sitting around somewhere! :)
It also illustrates very nicely why I'll keep thinking that it'd be so much easier if Qt had a review system to which you can upload the (possibly pruned) results of `git diff` (and download it again if needed).
I've learned along the way that I tend to be too sloppy and absent-minded to be trusted with series of commands you showed, esp. if they have names that aren't necessarily very clear about what they do. What works well for me e.g. before doing a commit is what I think of as manual rebasing: I remove my patches one way or another, git-pull, and then reapply the patch(es). A repo like qtbase is a bit big to mess up locally and then just check out again on a regular basis.
I don't know what exactly went wrong with my 1st attempt to use branches (I did do a checkout and verified that I was on my branch), but now that I know how to create topic branches and switch between them, "rewinding" to a clean state should be as simple as deleting the branch (presuming that can be done without merging it).
More information about the Development