[
https://issues.apache.org/jira/browse/JAMES-2559?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=16647655#comment-16647655
]
ASF GitHub Bot commented on JAMES-2559:
---------------------------------------
GitHub user aduprat opened a pull request:
https://github.com/apache/james-project/pull/135
JAMES-2559 Add original branch parameter in merging tool
You can merge this pull request into a Git repository by running:
$ git pull https://github.com/aduprat/james-project cherry-pick-merge-tool
Alternatively you can review and apply these changes as the patch at:
https://github.com/apache/james-project/pull/135.patch
To close this pull request, make a commit to your master/trunk branch
with (at least) the following in the commit message:
This closes #135
----
commit 0144a66b9d1cd52c105e07b40f0bc230f8a75a5c
Author: Antoine Duprat <aduprat@...>
Date: 2018-10-10T13:24:26Z
JAMES-2559 Add original branch parameter in merging tool
----
> Branch merge should be on a specific original branch
> ----------------------------------------------------
>
> Key: JAMES-2559
> URL: https://issues.apache.org/jira/browse/JAMES-2559
> Project: James Server
> Issue Type: New Feature
> Components: docker
> Reporter: Antoine Duprat
> Priority: Major
> Fix For: 3.2.0
>
>
> Actually, the branch merging tool is merging one branch into `master`.
> In order to be more flexible, we have to introduce a new parameter and merge
> the branch into the given original branch.
--
This message was sent by Atlassian JIRA
(v7.6.3#76005)
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org
For additional commands, e-mail: server-dev-h...@james.apache.org
