Re: bugfix-WIP branch

On Sun, Jul 13, 2014 at 07:48:38PM +0200, Joakim Nilsson wrote:
> [..] But I don't find 'bugfix-WIP'.
> Should it not be listed when I execute 'git branch -a' or do I
> misunderstand how git works?

bugfix-WIP has been fast forward merged into master and then deleted.
this combination may lead to confusion indeed, if you're not fast
enough.

one of these should improve the situation, and should be applied to
branches that have been mentioned on this list (next time).

1) branches remain alive after merge.
2) merge branches with --no-ff and fill in a message.

i think 2) is better and sufficient.

cheers
felix

PS: i think bugfix-WIP was c6e4bee952affcaa4593e7e1de5e04b9c3e03620 before it
was deleted.