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/02/16 23:47:47 UTC
[GitHub] junichi11 commented on issue #424: [NETBEANS-283] private_key in libs.git module should be renamed
junichi11 commented on issue #424: [NETBEANS-283] private_key in libs.git module should be renamed
URL: https://github.com/apache/incubator-netbeans/pull/424#issuecomment-366390943
Probably, your master branch has merge commits. Merge commits were created when you merged the upstream master branch into your master branch. This is not a fast-forward merge. e.g. This(https://github.com/geertjanw/incubator-netbeans/commit/eb425e4318aa3c391539a0ad5965c002f45dce0a) does not exist in the upstream master branch.
So you should clean up your master branch.
I assume that apache/incubator-netbeans repository is added as upstream.
The simplest way is removing your repository. Then fork apache/incubator-netbeans repository again.
Although I can take no responsibility...
Another way:
```
git fetch upstream
git checkout master
git reset --hard upstream/master
git push -f origin master // push forcibly
git checkout -b your-new-branch
```
Anyone, Is this way wrong?
----------------------------------------------------------------
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