[GitHub] matthiasblaesing commented on issue #3: NETBEANS-59 - Document split actions

[GitBox <gi...@apache.org>]

matthiasblaesing commented on issue #3: NETBEANS-59 - Document split actions
URL: https://github.com/apache/incubator-netbeans/pull/3#issuecomment-394105163
 
 
   I tried a classic git rebase - I'll make it short: I aborted it, as it ended with a lot of merge conflicts. The history of this PR is long and winding and this makes it hard.
   
   In this case I would try the github "Squash and merge" variant. This should result in one commit in the history.
   
   You could do it by hand:
   
   - checkout master into a working branch lets call it `pr3-merged`
   - make sure you have github PRs fetched (in my case the remote is called github) - if so there should be a branch `github/pr/3` which holds the changes from this PR
   - merge `github/pr/3` into `pr3-merged`
   - create a diff between `master` and `pr3-merged`: `git diff master..pr3-merged > ../pr3.patch` the output can be outputted into a file and that patch is the core of this PR
   - now you could switch your clone back to `master`
   - delete the `feature/248233-doc-split-actions` branch locally
   - checkout master as a new branch `feature/248233-doc-split-actions`
   - apply the patch created above via `git apply ../pr3.patch`
   - commit the changes
   - force push into the existing `feature/248233-doc-split-actions` in the repository `Chris2011`
   
   If you have done it before, this can be done quickly, if not, I would not start in a big repository like netbeans :-)

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