Yes, some combination of ‘git rebase’ and ‘git merge’, then ‘git push'. (Always remembering that as a committer you are gatekeeper for IP.)
Julian > On Apr 18, 2016, at 7:07 PM, Zuyu Zhang <[email protected]> wrote: > > Hi Julian, > > I got your point on how to merge the existing open PRs. That should work. > Thanks! > > My concern is that the current master branch of the Apache repo is a few > commits behind that of the pivotalsotware one. So could we rebase some > commits in the master branch? > > Cheers, > Zuyu
