On Wed, Jul 20, 2016 at 6:06 PM, Michael <keybou...@gmail.com> wrote:
> > On 2016-07-19, at 11:02 PM, Charles Manning <cdhmann...@gmail.com> wrote: > > Squashing makes sense if you have a really ratty bunch of checkins with > work-in-progress checkins etc., but unless it's a trivial topic branch I > would still typically make the final set of commits into a few logical > steps. > > It costs pretty much nothing to leave old topic branches around (but a few > thousand "nothings" can add up :-)). > > Once you've merged a topic branch you can safely delete the branch with no > harm (apart from losing the branch itself). > > As Gergely says it depends on your workflow. > > For example let's say you are using some fault tracking database (eg. > trac). It often makes sense to do the fix on a topic branch (eg. > fix-trac-1234). If you leave the branch in place after merging it you can > then refer to the branch in the trac notes and see what fixes were used to > fix the bug (and reopen the bug if it needs another kick). > > > This actually is why I'd like to keep the old "messy work-in-progress" > history, so I can see what had to be done should it be necessary to go > back. I still would like some way to be able to see, at a glance, "This > branch is marked as committed, so I don't have to worry that I forgot about > it". > > Well as you can see from this thread, there is no "one true way". By "messy work in progress, I mean those little checkins along the way when you're doing little experiments, deleting them and trying something else. I will often do little WIP checkins so I don't lose say 15 minutes of work. They are not useful commits in themselves, It is generally worth cleaning those up so that you end up with fewer "logical" commits without all the little mis-steps. But why not just start off keep the closed topic branches. If you don't like them you can always delete them later. I would suggest giving them a fixed format so that they are easy to filter out and delete/rename later,\ > --- > Entertaining minecraft videos > http://YouTube.com/keybounce > > -- > You received this message because you are subscribed to the Google Groups > "Git for human beings" group. > To unsubscribe from this group and stop receiving emails from it, send an > email to git-users+unsubscr...@googlegroups.com. > For more options, visit https://groups.google.com/d/optout. > -- You received this message because you are subscribed to the Google Groups "Git for human beings" group. To unsubscribe from this group and stop receiving emails from it, send an email to git-users+unsubscr...@googlegroups.com. For more options, visit https://groups.google.com/d/optout.
