mswiderski/droolsjbpm-integration — pull request #1 by mrietveld (2014-07-10 14:39:16+00:00)
Title: BPMSPL-70 changes rebased onto the latest master (after GUVNOR-2016/JBPM-4387 refactor)

Hi Maciej,

I would do the following:
- rename your old branch to "BPMSPL-70-old"
- update your master branch to sync with the droolsjbpm/droolsjbpm-integration master branch
- use this pull request to create the BPMSPL-70

Otherwise, you can also just take your branch and rebase it on top of an updated/synced master.

In order to create this pull-request branch, the only thing I did was rebase your branch on top of the latest master. There were only a couple of conflicts, but they were all minor import lines (20 lines in total?).

When I refactored stuff, I made sure to use "git mv" so that git would know that the moved files were "moved" (for example, kie-services-remote is now kie-remote-services, but git has linked the history of the kie-services-remote files to the files in kie-remote-services because I used git mv.

Hope this helps..
For that reason, the rebase is relatively painless.