Mark, I think that we have this situation with my PR #202. I keep syncing my code with the current master to pick up the latest changes, and it adds a 'Merge remote-tracking branch...' commit line each time. Is there another way that this should be handled? I think that it is important to keep the branches synced and make sure that none of the new changes in master conflict with my current changes for the PR, but I am new to git so I don't know how this affects the code review or PR approval process.
Thanks, Matt On Sep 10, 2013, at 6:15 PM, Marek Otahal <[email protected]> wrote: > David, > > > On Wed, Sep 11, 2013 at 1:46 AM, David Ragazzi <[email protected]> wrote: > > I didn't understand well, do you mean commit description with "merging > master..." title without many details? If so, I also believe this delay the > flow, because it takes more time to reviewers organize the PRs. > I meant the situation where a PR looks like for a branch blah: > changeA > changeB > merge master to branch blah > changeC > merge master... > merge master > ... > > and now blah gets merged. (Now I wonder if those "useless" merge master.. > commits appear in log, or are removed in some clever way? ) > > _______________________________________________ > nupic mailing list > [email protected] > http://lists.numenta.org/mailman/listinfo/nupic_lists.numenta.org
_______________________________________________ nupic mailing list [email protected] http://lists.numenta.org/mailman/listinfo/nupic_lists.numenta.org
