<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
<html>
<head>
<meta http-equiv="content-type" content="text/html; charset=UTF-8">
</head>
<body text="#000000" bgcolor="#ffffff">
Because git is new for many of us, here's a short intro on how to
cherry pick.<br>
<br>
From the command line<br>
===============<br>
<ul>
<li>do you changes on master</li>
<li>commit and push those changes</li>
<li>Use "git log" or the commit list, to know the commit id's of
your commits<br>
</li>
<li>checkout the release branch:</li>
<ul>
<li>only 1 module:</li>
<ul>
<li>cd guvnor</li>
<li>git checkout 5.2.x</li>
</ul>
<li>all modules at once</li>
<ul>
<li>droolsjbpm-build-bootstrap/script/branches/git-checkout-all.sh
5.2.x 5.1.x</li>
</ul>
</ul>
<li>cherry pick every commit id you want to cherry-pick<br>
</li>
<ul>
<li>git cherry-pick 5ab86f81ad10cd52f99496f2f5d8812176fc3a43</li>
<ul>
<li>If there's no merge conflict, you're done for this commit</li>
<li>If there's a merge conflict:</li>
<ul>
<li>open the conflictingFile, fix it</li>
<li>git add conflictingFile</li>
<li>git commit -c 5ab86f81ad10cd52f99496f2f5d8812176fc3a43<br>
</li>
</ul>
</ul>
</ul>
<li>test if it works</li>
<li>push those changes<br>
</li>
<li>checkout master again</li>
<ul>
<li>only 1 module:</li>
<ul>
<li>cd guvnor</li>
<li>git checkout master<br>
</li>
</ul>
</ul>
<ul>
<li>all modules at once</li>
<ul>
<li>droolsjbpm-build-bootstrap/script/branches/git-checkout-all.sh
master master</li>
</ul>
</ul>
</ul>
With IntelliJ<br>
=======<br>
<ul>
<li>Checkout the release branches (as described above)</li>
<li>open bottom panel "Changes", tab "Log", click button "Refresh"
(icon 2 yellow arrows), wait</li>
<li>select your change, click button "Cherry pick" (icon 2
cherries)</li>
<li>commit those changes. In the top right corner, make sure you
select </li>
<li>test and push and checkout master again (as described above)</li>
</ul>
With Eclipse<br>
========<br>
<br>
Idunno, but Egit is suppose to support cherry picking too :)<br>
<pre class="moz-signature" cols="72">--
With kind regards,
Geoffrey De Smet</pre>
</body>
</html>