Re: [ptp-dev] Merge

[Greg Watson <g.watson@xxxxxxxxxxxx>]

On Nov 18, 2011, at 10:09 PM, Roland Schulz wrote:>

>
> Another question about merging. Suppose I make a commit, and 50 other people make commits which are all pushed upstream to the 5_0 branch. When I merge with master, I'm going to merge all 51 commits  right?

Yes

> That means I have to manually work out which of each of the 50 commits should merged and which shouldn't. Is that correct?

No. I suggest that anyone submitting to ptp_5_0 and not wanting to have it in master should immediate merge and revert so that this gets not forgotten.

So let me get this straight. Everyone who commits to ptp_5_0 also has to merge the change with master, then revert the change if it is not meant for master? i.e. they have to remember to take some action if they *don't* want something to happen, as opposed to taking action when they *do* want something to happen.

This needs to be documented somewhere since this arse-about nature is not intuitive and completely different from how CVS worked.

Greg