On Tue, Jan 26, 2016 at 11:36 AM, Michael McCandless <[email protected]> wrote: > Why is this a problem? > > It records the fact that you had pull'd and had to merge your changes > with what "came in" from master from other devs.
The branch just reflects when Joel last pulled changes before making his own changes (local to him). That is normally going to be irrelevant. The majority of our changes are of the form "I want this change on both 5x and trunk" and cherry-pick is normally the cleanest way to represent that. -Yonik --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
