I suggest one of you creates a branch and you flatten each of your sequential commits into that branch one at a time. The person to create the branch should be the first commit and then proceed in order.
Or if you all agree then one of you can just create a branch with the final end game committing with "Submitted by: .., .. and ..." Entirely up to the three of you to agree what you want to do and what is acceptable to you On 9 January 2017 at 15:29, Christian Schulte <c...@schulte.it> wrote: > Am 01/09/17 um 16:13 schrieb Christian Schulte: > > Hi, > > > > there have been various issues in JIRA regarding the launcher scripts. > > Is it possible to squash all those commits into one and then mention all > > JIRA issues in the commit message so that the commit is added to each > > JIRA issue? Last time I did this I think Jenkins was able to add > > comments to all issues involved. I would just copy the launchers from > > the pre-reset-master branch to master and just mention all issues in the > > commit. > > > > Regards, > > > > Put another way. There are multiple issues in JIRA all dealing with the > launcher scripts assigned to three different persons. Michael Osipov, > Tibor Digana and me. Who wants to work on that? That should be only one > person. Just assign yourself in JIRA then: > > MNG-5815 > MNG-5889 > MNG-5962 > MNG-5963 > MNG-6001 > MNG-6003 > > I just unassigned me from the one issue I was assigned to. One note: > Last commit to the Windows launcher is from me. Whatever gets committed, > make sure to run the 'maven-assembly-plugin' ITs on Windows from inside > a directory containing spaces and and ampersand character like: > > mkdir "directory with spaces and a & special char" > cd "directory with spaces and a & special char" > svn checkout > https://svn.apache.org/repos/asf/maven/plugins/trunk/maven-assembly-plugin > cd maven-assemby-plugin > mvn -Prun-its verify > > You'll need to use the trunk of that plugin because it relies on a > invoker plugin snapshot. That needs to pass on Linux and Windows. > > Regards, > -- > Christian > > > --------------------------------------------------------------------- > To unsubscribe, e-mail: dev-unsubscr...@maven.apache.org > For additional commands, e-mail: dev-h...@maven.apache.org > >
