Because git is new for many of us, here's a short intro on how to cherry
pick.
From the command line
===============
* do you changes on master
* commit and push those changes
* Use "git log" or the commit list, to know the commit id's of your
commits
* checkout the release branch:
o only 1 module:
+ cd guvnor
+ git checkout 5.2.x
o all modules at once
+ droolsjbpm-build-bootstrap/script/branches/git-checkout-all.sh
5.2.x 5.1.x
* cherry pick every commit id you want to cherry-pick
o git cherry-pick 5ab86f81ad10cd52f99496f2f5d8812176fc3a43
+ If there's no merge conflict, you're done for this commit
+ If there's a merge conflict:
# open the conflictingFile, fix it
# git add conflictingFile
# git commit -c
5ab86f81ad10cd52f99496f2f5d8812176fc3a43
* test if it works
* push those changes
* checkout master again
o only 1 module:
+ cd guvnor
+ git checkout master
o all modules at once
+ droolsjbpm-build-bootstrap/script/branches/git-checkout-all.sh
master master
With IntelliJ
=======
* Checkout the release branches (as described above)
* open bottom panel "Changes", tab "Log", click button "Refresh"
(icon 2 yellow arrows), wait
* select your change, click button "Cherry pick" (icon 2 cherries)
* commit those changes. In the top right corner, make sure you select
* test and push and checkout master again (as described above)
With Eclipse
========
Idunno, but Egit is suppose to support cherry picking too :)
--
With kind regards,
Geoffrey De Smet
_______________________________________________
rules-dev mailing list
rules-dev@lists.jboss.org
https://lists.jboss.org/mailman/listinfo/rules-dev
