We've already reviewed the branch and done a CI build with the full integration tests before we get to the merging point.
On 16 January 2017 at 09:18, Fred Cooke <fred.co...@gmail.com> wrote: > Perfect, if reviews aren't part of the deal. <3 > > On Mon, Jan 16, 2017 at 10:11 PM, Stephen Connolly < > stephen.alan.conno...@gmail.com> wrote: > > > I do not thing we want an overly heavy process. > > > > For the 3.5.0 release I suggest we try the following. Rebase so that it > is > > a fast-forward merge > > > > git checkout BRANCH > > git fetch origin > > git rebase origin/master > > git push origin BRANCH:master > > > > if that git push fails, > > > > fetch > > rebase > > push > > > > once your push has succeeded > > > > git push origin :BRANCH > > > > > > On 16 January 2017 at 08:51, Christian Schulte <c...@schulte.it> wrote: > > > > > Am 16.01.2017 um 09:00 schrieb Fred Cooke: > > > > No, not correct in my books. > > > > > > > > git checkout BRANCH # Assuming it's local already > > > > git fetch upstream # risk free, unlike pull! > > > > git rebase upstream/master # diff difftool merge mergetool settings > are > > > > useful, prompt = false and specify your diff tool in advance > > > > git push --force upstream BRANCH # After verifying no one has pushed > to > > > it > > > > # create pull request/email someone/communicate your intention to > have > > it > > > > merged > > > > > > > > ^ correct in my books, others may differ. > > > > > > I merged pull requests from others in the past as well. Create pull > > > requests for master even if I am a committer? Really? That would mean I > > > would create a pull request I will pull in myself afterwards? Leave the > > > merge commit so that the merges can be tracked back to the PR? > > > > > > Regards, > > > -- > > > Christian > > > > > > > > > --------------------------------------------------------------------- > > > To unsubscribe, e-mail: dev-unsubscr...@maven.apache.org > > > For additional commands, e-mail: dev-h...@maven.apache.org > > > > > > > > >
