Why are you needing to rebase constantly?

Unless the merge has conflicts you should be fine pushing to master post
merge... if there is a test failure post merge (due to an unanticipated
interaction) we can just add the fix on top

On Sun 22 Jan 2017 at 16:36, Christian Schulte <c...@schulte.it> wrote:

> Am 22.01.2017 um 13:58 schrieb Michael Osipov:
>
> > Am 2017-01-22 um 11:22 schrieb Stephen Connolly:
>
> >> I'm currently waiting on Hervé to start the 1.0.3 release of resolver.
>
> >>
>
> >> Once we get that I'm going to start cutting RCs (I plan 2 a week apart)
>
> >>
>
> >> Once we have a stable RC I will cut the release, and start a clock
> towards
>
> >> 3.5.1 (6 weeks approx)
>
> >>
>
> >> If you miss the boat, you can catch the next one, but we need to get
> this
>
> >> project into a rhythm.
>
> >>
>
> >
>
> > I started already working on the blessed issues. Do I need someone's
>
> > else consent to merge my issue branch into master assuming that it
>
> > passes the build in Jenkins?
>
> >
>
> > I also have several issues need to be seconed by someone else:
>
> >
>
> > MNG-5823 mvnDebug doesn't work with M2_HOME with spaces - missing quotes
>
>
>
> FIX-3.5.0
>
>
>
> > MNG-5837 Syntax error in bin/mvn on Solaris SPARC
>
>
>
> FIX-3.5.0
>
>
>
> I haven't looked at the others but I'd trust you know what you are doing
>
> and would just say FIX-3.5.0 to them as well. Just provide a branch to
>
> review. If that gets merged to the 3.5.0 master or to 3.5.1 or 3.6.0
>
> does not matter. I have to rebase quite a lot of branches myself already
>
> whenever master changes. By the way, can you please review the issues in
>
> JIRA with 3.5.0-candidate? Maybe some of them should be FIX-3.5.0 as well.
>
>
>
> <
> https://issues.apache.org/jira/issues/?jql=fixVersion%20%3D%203.5.0-candidate%20AND%20project%20%3D%20MNG%20ORDER%20BY%20key%20ASC
> >
>
>
>
> Regards,
>
> --
>
> Christian
>
>
>
>
>
> ---------------------------------------------------------------------
>
> To unsubscribe, e-mail: dev-unsubscr...@maven.apache.org
>
> For additional commands, e-mail: dev-h...@maven.apache.org
>
>
>
> --
Sent from my phone

Reply via email to