maven-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Stephen Connolly <stephen.alan.conno...@gmail.com>
Subject Re: [2/2] maven git commit: Merge branch 'MNG-5629'
Date Mon, 16 Jan 2017 08:13:58 GMT
Well:

1. one should never 'git push --force' rather 'git push --force-with-lease'
(which is not perfect, but just better)

2. Its all moot as 'master' is protected and will refuse an actual force
push

On Mon 16 Jan 2017 at 08:00, Fred Cooke <fred.cooke@gmail.com> wrote:

> 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.
>
>
>
>
>
> On Mon, Jan 16, 2017 at 8:52 PM, Christian Schulte <cs@schulte.it> wrote:
>
>
>
> > Am 16.01.2017 um 08:27 schrieb Fred Cooke:
>
> > > Rebase is the only clean way forward for small projects in which people
>
> > > step on each others toes.
>
> > >
>
> > > Merge commits are difficult to comprehend for some developers, leading
> to
>
> > > errors. Avoiding them is beneficial.
>
> > >
>
> > > On Mon, Jan 16, 2017 at 8:23 PM, Hervé BOUTEMY <herve.boutemy@free.fr>
>
> > > wrote:
>
> > >
>
> > >> do we want to keep such merge commits?
>
> >
>
> > Just to clarify. I should have done the following:
>
> >
>
> > cmd> git checkout master
>
> > cmd> git merge BRANCH
>
> > cmd> git rebase (possible -i to do some housekeeping)
>
> > cmd> git push
>
> >
>
> > Correct? I did this but then decided to keep that merge commit so that
>
> > it's obvious that there had been a branch carrying the commit(s).
>
> >
>
> > Regards,
>
> > --
>
> > Christian
>
> >
>
> >
>
> > ---------------------------------------------------------------------
>
> > To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
>
> > For additional commands, e-mail: dev-help@maven.apache.org
>
> >
>
> >
>
> --
Sent from my phone

Mime
  • Unnamed multipart/alternative (inline, None, 0 bytes)
View raw message