Jason Merrill <ja...@redhat.com> writes: > I would expect feature branches to merge from trunk when needed during > development. When merging the feature into trunk the developer can just > use git merge --squash and then decide whether to commit it in one hunk or > several.
This will of course lose the history of the feature branch. Andreas. -- Andreas Schwab, sch...@linux-m68k.org GPG Key fingerprint = 58CA 54C7 6D53 942B 1756 01D3 44D5 214B 8276 4ED5 "And now for something completely different."
