You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@netbeans.apache.org by GitBox <gi...@apache.org> on 2018/08/01 10:49:42 UTC
[GitHub] junichi11 opened a new pull request #644: Merge the 2ndDonation
branch into the master branch
junichi11 opened a new pull request #644: Merge the 2ndDonation branch into the master branch
URL: https://github.com/apache/incubator-netbeans/pull/644
I ran the following command:
```
$ git checkout master
$ git checkout -b integrate-2ndDonation
$ git merge --allow-unrelated-histories --no-ff 2ndDonation
```
Then resolved the merge conflict (nbbuild/cluster.properties).
I just kept the master branch's file. Is this correct?
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
With regards,
Apache Git Services
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@netbeans.apache.org
For additional commands, e-mail: notifications-help@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists