netbeans-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From GitBox <...@apache.org>
Subject [GitHub] junichi11 commented on issue #208: [NETBEANS-54] Module Review refactoring.java
Date Thu, 01 Jan 1970 00:00:00 GMT
junichi11 commented on issue #208: [NETBEANS-54] Module Review refactoring.java
URL: https://github.com/apache/incubator-netbeans/pull/208#issuecomment-340637384
 
 
   Thank you for working on this.
   
   Could you please create a topic branch? Then, please add your changes there. The master
branch should be used to update with the upstream master branch.
   
   https://github.com/apache/incubator-netbeans/pull/134 was already squashed and merged.
But your master branch has their commits. So we have to squash to avoid adding some commits
every time when we merge your current master branch into our master branch.
   
   To clean your master branch, 
   
   - Backup your current change: e.g. https://patch-diff.githubusercontent.com/raw/apache/incubator-netbeans/pull/208.diff
   - Close this PR
   - Remove your master branch
   - `git fetch upstream`
   - Checkout master branch: e.g. `git checkout -b master upstream/master`
   - Push your master branch: e.g. `git push origin master` probably, need `-f` option to
overwrite your master branch.
   - Create a topic branch: e.g. `git checkout -b your-branch-name`
   - Apply your backup to your topic branch
   - Push your topic branch
   - New PR
   
   **NOTE**: I can be wrong. So you should google if you are not sure above.
   

----------------------------------------------------------------
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

Mime
View raw message