Workflow problem resulting in useless commit messages

[Matthew D. Fuller]

On Thu, Dec 11, 2008 at 12:28:05PM +1100 I heard the voice of
Ben Finney, and lo! it spake thus:
> 
> I think ‘push’ is to be avoided just like ‘pull’, for the same
> reason: both commands are used when you want to maintain a mirror,
> not a divergent branch.
> 
> Instead, you should merge into the ‘trunk’ branch from the
> ‘feature-X’ branch. That way the history in each correctly reflects
> how both of them developed over time.

This is definitely the better way to do it.  You can do it manually by
merging into a trunk mirror and pushing, but it's probably far easier
to just keep a checkout of trunk around, and merge/commit into that
when you want to land it.


-- 
Matthew Fuller     (MF4839)   |  fullermd at over-yonder.net
Systems/Network Administrator |  http://www.over-yonder.net/~fullermd/
           On the Internet, nobody can hear you scream.