<!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">
<h3 id="internal-source-marker_0.3105373097433234"><span
style="font-size: 14pt; font-family: Arial; color: rgb(0, 0, 0);
background-color: transparent; font-weight: bold; font-style:
normal; text-decoration: none; vertical-align: baseline;">Purpose</span></h3>
<span style="font-size: 11pt; font-family: Arial; color: rgb(0, 0,
0); background-color: transparent; font-weight: normal;
font-style: normal; text-decoration: none; vertical-align:
baseline;">This document shows you how to use Git, just as you
were using SVN in the past. </span><span style="font-size: 11pt;
font-family: Arial; color: rgb(0, 0, 0); background-color:
transparent; font-weight: bold; font-style: normal;
text-decoration: none; vertical-align: baseline;">It is to get you
guys up and running with git as soon as possible</span><span
style="font-size: 11pt; font-family: Arial; color: rgb(0, 0, 0);
background-color: transparent; font-weight: normal; font-style:
normal; text-decoration: none; vertical-align: baseline;"> by
relying on your SVN knowledge and it is focuses on what you want
to do in drools.</span><br>
<span style="font-size: 11pt; font-family: Arial; color: rgb(0, 0,
0); background-color: transparent; font-weight: bold; font-style:
normal; text-decoration: none; vertical-align: baseline;">This
document does not </span><span style="font-size: 11pt;
font-family: Arial; color: rgb(0, 0, 0); background-color:
transparent; font-weight: bold; font-style: italic;
text-decoration: none; vertical-align: baseline;">really</span><span
style="font-size: 11pt; font-family: Arial; color: rgb(0, 0, 0);
background-color: transparent; font-weight: bold; font-style:
normal; text-decoration: none; vertical-align: baseline;"> teach
you Git.</span><span style="font-size: 11pt; font-family: Arial;
color: rgb(0, 0, 0); background-color: transparent; font-weight:
normal; font-style: normal; text-decoration: none; vertical-align:
baseline;"> Git is not just SVN++, it is much more and you should
take some time to learn that too.</span><br>
<h3><span style="font-size: 14pt; font-family: Arial; color: rgb(0,
0, 0); background-color: transparent; font-weight: bold;
font-style: normal; text-decoration: none; vertical-align:
baseline;">Terminology</span></h3>
<span style="font-size: 11pt; font-family: Arial; color: rgb(0, 0,
0); background-color: transparent; font-weight: normal;
font-style: normal; text-decoration: none; vertical-align:
baseline;">SVN trunk is renamed to Git master. A branch is still a
branch. A tag is still a tag.</span><br>
<span style="font-size: 11pt; font-family: Arial; color: rgb(0, 0,
0); background-color: transparent; font-weight: bold; font-style:
italic; text-decoration: none; vertical-align: baseline;">Translation
note</span><span style="font-size: 11pt; font-family: Arial;
color: rgb(0, 0, 0); background-color: transparent; font-weight:
bold; font-style: normal; text-decoration: none; vertical-align:
baseline;">: trunk == master</span><span style="font-size: 11pt;
font-family: Arial; color: rgb(0, 0, 0); background-color:
transparent; font-weight: normal; font-style: normal;
text-decoration: none; vertical-align: baseline;"></span><br>
<span style="font-size: 11pt; font-family: Arial; color: rgb(0, 0,
0); background-color: transparent; font-weight: normal;
font-style: normal; text-decoration: none; vertical-align:
baseline;"></span><br>
<span style="font-size: 11pt; font-family: Arial; color: rgb(0, 0,
0); background-color: transparent; font-weight: normal;
font-style: normal; text-decoration: none; vertical-align:
baseline;">The SVN central repository is now the </span><span
style="font-size: 11pt; font-family: Arial; color: rgb(0, 0, 0);
background-color: transparent; font-weight: normal; font-style:
italic; text-decoration: none; vertical-align: baseline;">reference</span><span
style="font-size: 11pt; font-family: Arial; color: rgb(0, 0, 0);
background-color: transparent; font-weight: normal; font-style:
normal; text-decoration: none; vertical-align: baseline;">
repository on github, see </span><a
href="https://docs.google.com/document/d/1xfC_R61ASX12zfgmarR_3leTjG8paUmO9q5qNVtTMRg/edit?hl=en"><span
style="font-size: 11pt; font-family: Arial; color: rgb(0, 0,
153); background-color: transparent; font-weight: normal;
font-style: normal; text-decoration: underline; vertical-align:
baseline;">https://github.com:droolsjbpm/droolsjbpm</span></a><span
style="font-size: 11pt; font-family: Arial; color: rgb(0, 0, 0);
background-color: transparent; font-weight: normal; font-style:
normal; text-decoration: none; vertical-align: baseline;">.</span><br>
<h2><span style="font-size: 18pt; font-family: Arial; color: rgb(0,
0, 0); background-color: transparent; font-weight: bold;
font-style: normal; text-decoration: none; vertical-align:
baseline;">Part 1: Need to know</span></h2>
<h3><span style="font-size: 14pt; font-family: Arial; color: rgb(0,
0, 0); background-color: transparent; font-weight: bold;
font-style: normal; text-decoration: none; vertical-align:
baseline;">Preparation</span></h3>
<span style="font-size: 11pt; font-family: Arial; color: rgb(0, 0,
0); background-color: transparent; font-weight: normal;
font-style: normal; text-decoration: none; vertical-align:
baseline;">If:</span>
<ul>
<li style="list-style-type: disc; font-size: 11pt; font-family:
Arial; color: rgb(0, 0, 0); background-color: transparent;
font-weight: normal; font-style: normal; text-decoration: none;
vertical-align: baseline;"><span style="font-size: 11pt;
font-family: Arial; color: rgb(0, 0, 0); background-color:
transparent; font-weight: normal; font-style: normal;
text-decoration: none; vertical-align: baseline;">you’ve done
the preparation in the dev list mail</span></li>
<ul>
<li style="list-style-type: circle; font-size: 11pt;
font-family: Arial; color: rgb(0, 0, 0); background-color:
transparent; font-weight: normal; font-style: normal;
text-decoration: none; vertical-align: baseline;"><span
style="font-size: 11pt; font-family: Arial; color: rgb(0, 0,
0); background-color: transparent; font-weight: normal;
font-style: normal; text-decoration: none; vertical-align:
baseline;">and the correction too, skip to section </span><span
style="font-size: 11pt; font-family: Arial; color: rgb(0, 0,
0); background-color: transparent; font-weight: normal;
font-style: italic; text-decoration: none; vertical-align:
baseline;">Getting the source code locally</span><span
style="font-size: 11pt; font-family: Arial; color: rgb(0, 0,
0); background-color: transparent; font-weight: normal;
font-style: normal; text-decoration: none; vertical-align:
baseline;">.</span></li>
<li style="list-style-type: circle; font-size: 11pt;
font-family: Arial; color: rgb(0, 0, 0); background-color:
transparent; font-weight: normal; font-style: normal;
text-decoration: none; vertical-align: baseline;"><span
style="font-size: 11pt; font-family: Arial; color: rgb(0, 0,
0); background-color: transparent; font-weight: normal;
font-style: normal; text-decoration: none; vertical-align:
baseline;">haven’t done the correction yet, do this first
(and the skip to that section):</span></li>
</ul>
</ul>
<ul>
<ul>
<ul>
<li style="list-style-type: square; font-size: 11pt;
font-family: Arial; color: rgb(0, 0, 0); background-color:
transparent; font-weight: normal; font-style: normal;
text-decoration: none; vertical-align: baseline;"><span
style="font-size: 11pt; font-family: Arial; color: rgb(0,
0, 0); background-color: transparent; font-weight: normal;
font-style: normal; text-decoration: none; vertical-align:
baseline;">Step 4 stated:</span></li>
<ul>
<li style="list-style-type: disc; font-size: 11pt;
font-family: Arial; color: rgb(0, 0, 0); background-color:
transparent; font-weight: normal; font-style: normal;
text-decoration: none; vertical-align: baseline;"><span
style="font-size: 11pt; font-family: Arial; color:
rgb(0, 0, 0); background-color: transparent;
font-weight: normal; font-style: normal;
text-decoration: none; vertical-align: baseline;">$ git
config --global user.name myUsername // WRONG</span></li>
</ul>
<li style="list-style-type: square; font-size: 11pt;
font-family: Arial; color: rgb(0, 0, 0); background-color:
transparent; font-weight: normal; font-style: normal;
text-decoration: none; vertical-align: baseline;"><span
style="font-size: 11pt; font-family: Arial; color: rgb(0,
0, 0); background-color: transparent; font-weight: normal;
font-style: normal; text-decoration: none; vertical-align:
baseline;">Correct that by running:</span></li>
<ul>
<li style="list-style-type: disc; font-size: 11pt;
font-family: Arial; color: rgb(0, 0, 0); background-color:
transparent; font-weight: normal; font-style: normal;
text-decoration: none; vertical-align: baseline;"><span
style="font-size: 11pt; font-family: Arial; color:
rgb(0, 0, 0); background-color: transparent;
font-weight: normal; font-style: normal;
text-decoration: none; vertical-align: baseline;">$ git
config --global user.name "My Name"</span></li>
<li style="list-style-type: disc; font-size: 11pt;
font-family: Arial; color: rgb(0, 0, 0); background-color:
transparent; font-weight: normal; font-style: normal;
text-decoration: none; vertical-align: baseline;"><span
style="font-size: 11pt; font-family: Arial; color:
rgb(0, 0, 0); background-color: transparent;
font-weight: normal; font-style: normal;
text-decoration: none; vertical-align: baseline;">$ git
config --global -l</span></li>
</ul>
</ul>
</ul>
<li style="list-style-type: disc; font-size: 11pt; font-family:
Arial; color: rgb(0, 0, 0); background-color: transparent;
font-weight: normal; font-style: normal; text-decoration: none;
vertical-align: baseline;"><span style="font-size: 11pt;
font-family: Arial; color: rgb(0, 0, 0); background-color:
transparent; font-weight: normal; font-style: normal;
text-decoration: none; vertical-align: baseline;">you haven’t
done the preparation yet, do it now, as stated below.</span></li>
</ul>
<br>
<span style="font-size: 11pt; font-family: Arial; color: rgb(0, 0,
0); background-color: transparent; font-weight: normal;
font-style: normal; text-decoration: none; vertical-align:
baseline;">Full preparation:</span>
<ul>
<li style="list-style-type: disc; font-size: 11pt; font-family:
Arial; color: rgb(0, 0, 0); background-color: transparent;
font-weight: normal; font-style: normal; text-decoration: none;
vertical-align: baseline;"><span style="font-size: 11pt;
font-family: Arial; color: rgb(0, 0, 0); background-color:
transparent; font-weight: normal; font-style: normal;
text-decoration: none; vertical-align: baseline;">1) Install
git for your OS</span></li>
<ul>
<li style="list-style-type: circle; font-size: 11pt;
font-family: Arial; color: rgb(0, 0, 0); background-color:
transparent; font-weight: normal; font-style: normal;
text-decoration: none; vertical-align: baseline;"><span
style="font-size: 11pt; font-family: Arial; color: rgb(0, 0,
0); background-color: transparent; font-weight: normal;
font-style: normal; text-decoration: none; vertical-align:
baseline;">1a) Linux: Install the package git (and
optionally gitk)</span></li>
<ul>
<li style="list-style-type: square; font-size: 11pt;
font-family: Arial; color: rgb(0, 0, 0); background-color:
transparent; font-weight: normal; font-style: normal;
text-decoration: none; vertical-align: baseline;"><span
style="font-size: 11pt; font-family: Arial; color: rgb(0,
0, 0); background-color: transparent; font-weight: normal;
font-style: normal; text-decoration: none; vertical-align:
baseline;">$ sudo apt-get install git</span></li>
<li style="list-style-type: square; font-size: 11pt;
font-family: Arial; color: rgb(0, 0, 0); background-color:
transparent; font-weight: normal; font-style: normal;
text-decoration: none; vertical-align: baseline;"><span
style="font-size: 11pt; font-family: Arial; color: rgb(0,
0, 0); background-color: transparent; font-weight: normal;
font-style: normal; text-decoration: none; vertical-align:
baseline;">$ sudo apt-get install gitk</span></li>
</ul>
<li style="list-style-type: circle; font-size: 11pt;
font-family: Arial; color: rgb(0, 0, 0); background-color:
transparent; font-weight: normal; font-style: normal;
text-decoration: none; vertical-align: baseline;"><span
style="font-size: 11pt; font-family: Arial; color: rgb(0, 0,
0); background-color: transparent; font-weight: normal;
font-style: normal; text-decoration: none; vertical-align:
baseline;">1b) Windows: Use the icon on the right on</span><a
href="http://git-scm.com/"><span style="font-size: 11pt;
font-family: Arial; color: rgb(0, 0, 0); background-color:
transparent; font-weight: normal; font-style: normal;
text-decoration: none; vertical-align: baseline;"> </span></a><a
href="http://git-scm.com"><span style="font-size: 11pt;
font-family: Arial; color: rgb(0, 0, 153);
background-color: transparent; font-weight: normal;
font-style: normal; text-decoration: underline;
vertical-align: baseline;">http://git-scm.com</span></a><a
href="http://git-scm.com/"><span style="font-size: 11pt;
font-family: Arial; color: rgb(0, 0, 153);
background-color: transparent; font-weight: normal;
font-style: normal; text-decoration: underline;
vertical-align: baseline;"></span></a></li>
<li style="list-style-type: circle; font-size: 11pt;
font-family: Arial; color: rgb(0, 0, 0); background-color:
transparent; font-weight: normal; font-style: normal;
text-decoration: none; vertical-align: baseline;"><span
style="font-size: 11pt; font-family: Arial; color: rgb(0, 0,
0); background-color: transparent; font-weight: normal;
font-style: normal; text-decoration: none; vertical-align:
baseline;">1c) Mac OSX: Use the icon on the right on</span><a
href="http://git-scm.com/"><span style="font-size: 11pt;
font-family: Arial; color: rgb(0, 0, 0); background-color:
transparent; font-weight: normal; font-style: normal;
text-decoration: none; vertical-align: baseline;"> </span><span
style="font-size: 11pt; font-family: Arial; color: rgb(0,
0, 153); background-color: transparent; font-weight:
normal; font-style: normal; text-decoration: underline;
vertical-align: baseline;">http://git-scm.com</span></a><span
style="font-size: 11pt; font-family: Arial; color: rgb(0, 0,
0); background-color: transparent; font-weight: normal;
font-style: normal; text-decoration: none; vertical-align:
baseline;"> </span></li>
<ul>
<li style="list-style-type: square; font-size: 11pt;
font-family: Arial; color: rgb(0, 0, 0); background-color:
transparent; font-weight: normal; font-style: normal;
text-decoration: none; vertical-align: baseline;"><span
style="font-size: 11pt; font-family: Arial; color: rgb(0,
0, 0); background-color: transparent; font-weight: normal;
font-style: normal; text-decoration: none; vertical-align:
baseline;">Optionally install gitx from</span><a
href="http://gitx.frim.nl/"><span style="font-size: 11pt;
font-family: Arial; color: rgb(0, 0, 0);
background-color: transparent; font-weight: normal;
font-style: normal; text-decoration: none;
vertical-align: baseline;"> </span><span
style="font-size: 11pt; font-family: Arial; color:
rgb(0, 0, 153); background-color: transparent;
font-weight: normal; font-style: normal;
text-decoration: underline; vertical-align: baseline;">http://gitx.frim.nl/</span></a><span
style="font-size: 11pt; font-family: Arial; color: rgb(0,
0, 0); background-color: transparent; font-weight: normal;
font-style: normal; text-decoration: none; vertical-align:
baseline;"></span></li>
</ul>
</ul>
<li style="list-style-type: disc; font-size: 11pt; font-family:
Arial; color: rgb(0, 0, 0); background-color: transparent;
font-weight: normal; font-style: normal; text-decoration: none;
vertical-align: baseline;"><span style="font-size: 11pt;
font-family: Arial; color: rgb(0, 0, 0); background-color:
transparent; font-weight: normal; font-style: normal;
text-decoration: none; vertical-align: baseline;">2) Install
git in your IDE</span></li>
<ul>
<li style="list-style-type: circle; font-size: 11pt;
font-family: Arial; color: rgb(0, 0, 0); background-color:
transparent; font-weight: normal; font-style: normal;
text-decoration: none; vertical-align: baseline;"><span
style="font-size: 11pt; font-family: Arial; color: rgb(0, 0,
0); background-color: transparent; font-weight: normal;
font-style: normal; text-decoration: none; vertical-align:
baseline;">2b) Eclipse: Install the EGit plugin.</span></li>
<ul>
<li style="list-style-type: square; font-size: 11pt;
font-family: Arial; color: rgb(0, 0, 0); background-color:
transparent; font-weight: normal; font-style: normal;
text-decoration: none; vertical-align: baseline;"><span
style="font-size: 11pt; font-family: Arial; color: rgb(0,
0, 0); background-color: transparent; font-weight: normal;
font-style: normal; text-decoration: none; vertical-align:
baseline;">Menu Help, menu item Install new software.</span></li>
<li style="list-style-type: square; font-size: 11pt;
font-family: Arial; color: rgb(0, 0, 0); background-color:
transparent; font-weight: normal; font-style: normal;
text-decoration: none; vertical-align: baseline;"><span
style="font-size: 11pt; font-family: Arial; color: rgb(0,
0, 0); background-color: transparent; font-weight: normal;
font-style: normal; text-decoration: none; vertical-align:
baseline;">Work with update site Helios, open Tree item
Collaboration, tree item Eclipse EGit.</span></li>
</ul>
<li style="list-style-type: circle; font-size: 11pt;
font-family: Arial; color: rgb(0, 0, 0); background-color:
transparent; font-weight: normal; font-style: normal;
text-decoration: none; vertical-align: baseline;"><span
style="font-size: 11pt; font-family: Arial; color: rgb(0, 0,
0); background-color: transparent; font-weight: normal;
font-style: normal; text-decoration: none; vertical-align:
baseline;">2c) IntelliJ: Enable the git plugin (if not
enabled):</span></li>
<ul>
<li style="list-style-type: square; font-size: 11pt;
font-family: Arial; color: rgb(0, 0, 0); background-color:
transparent; font-weight: normal; font-style: normal;
text-decoration: none; vertical-align: baseline;"><span
style="font-size: 11pt; font-family: Arial; color: rgb(0,
0, 0); background-color: transparent; font-weight: normal;
font-style: normal; text-decoration: none; vertical-align:
baseline;">Menu file, menu item Other Settings, menu item
Configure plugins.</span></li>
</ul>
</ul>
<li style="list-style-type: disc; font-size: 11pt; font-family:
Arial; color: rgb(0, 0, 0); background-color: transparent;
font-weight: normal; font-style: normal; text-decoration: none;
vertical-align: baseline;"><span style="font-size: 11pt;
font-family: Arial; color: rgb(0, 0, 0); background-color:
transparent; font-weight: normal; font-style: normal;
text-decoration: none; vertical-align: baseline;">3) Get a
Github account:</span><a href="https://github.com/signup/free"><span
style="font-size: 11pt; font-family: Arial; color: rgb(0, 0,
0); background-color: transparent; font-weight: normal;
font-style: normal; text-decoration: none; vertical-align:
baseline;"> </span></a><a
href="https://github.com/signup/free"><span style="font-size:
11pt; font-family: Arial; color: rgb(0, 0, 153);
background-color: transparent; font-weight: normal;
font-style: normal; text-decoration: underline;
vertical-align: baseline;">https://github.com/signup/free</span></a><a
href="https://github.com/signup/free"><span style="font-size:
11pt; font-family: Arial; color: rgb(0, 0, 153);
background-color: transparent; font-weight: normal;
font-style: normal; text-decoration: underline;
vertical-align: baseline;"></span></a></li>
<li style="list-style-type: disc; font-size: 11pt; font-family:
Arial; color: rgb(0, 0, 0); background-color: transparent;
font-weight: normal; font-style: normal; text-decoration: none;
vertical-align: baseline;"><a
href="https://github.com/signup/free"><span style="font-size:
11pt; font-family: Arial; color: rgb(0, 0, 0);
background-color: transparent; font-weight: normal;
font-style: normal; text-decoration: none; vertical-align:
baseline;">4</span></a><span style="font-size: 11pt;
font-family: Arial; color: rgb(0, 0, 0); background-color:
transparent; font-weight: normal; font-style: normal;
text-decoration: none; vertical-align: baseline;">) Configure
git correctly (Github also tells you this):</span></li>
<ul>
<li style="list-style-type: circle; font-size: 11pt;
font-family: Arial; color: rgb(0, 0, 0); background-color:
transparent; font-weight: normal; font-style: normal;
text-decoration: none; vertical-align: baseline;"><span
style="font-size: 11pt; font-family: Arial; color: rgb(0, 0,
0); background-color: transparent; font-weight: normal;
font-style: normal; text-decoration: none; vertical-align:
baseline;">$ git --version</span></li>
<li style="list-style-type: circle; font-size: 11pt;
font-family: Arial; color: rgb(0, 0, 0); background-color:
transparent; font-weight: normal; font-style: normal;
text-decoration: none; vertical-align: baseline;"><span
style="font-size: 11pt; font-family: Arial; color: rgb(0, 0,
0); background-color: transparent; font-weight: normal;
font-style: normal; text-decoration: none; vertical-align:
baseline;">git version 1.7.1</span></li>
<li style="list-style-type: circle; font-size: 11pt;
font-family: Arial; color: rgb(0, 0, 0); background-color:
transparent; font-weight: normal; font-style: normal;
text-decoration: none; vertical-align: baseline;"><span
style="font-size: 11pt; font-family: Arial; color: rgb(0, 0,
0); background-color: transparent; font-weight: normal;
font-style: normal; text-decoration: none; vertical-align:
baseline;">$ git config --global user.name "My Full Name"</span></li>
<li style="list-style-type: circle; font-size: 11pt;
font-family: Arial; color: rgb(0, 0, 0); background-color:
transparent; font-weight: normal; font-style: normal;
text-decoration: none; vertical-align: baseline;"><span
style="font-size: 11pt; font-family: Arial; color: rgb(0, 0,
0); background-color: transparent; font-weight: normal;
font-style: normal; text-decoration: none; vertical-align:
baseline;">$ git config --global user.email </span><a
href="mailto:myAccount@gmail.com"><span style="font-size:
11pt; font-family: Arial; color: rgb(0, 0, 153);
background-color: transparent; font-weight: normal;
font-style: normal; text-decoration: underline;
vertical-align: baseline;">myAccount@gmail.com</span></a><span
style="font-size: 11pt; font-family: Arial; color: rgb(0, 0,
0); background-color: transparent; font-weight: normal;
font-style: normal; text-decoration: none; vertical-align:
baseline;"></span></li>
<li style="list-style-type: circle; font-size: 11pt;
font-family: Arial; color: rgb(0, 0, 0); background-color:
transparent; font-weight: normal; font-style: normal;
text-decoration: none; vertical-align: baseline;"><span
style="font-size: 11pt; font-family: Arial; color: rgb(0, 0,
0); background-color: transparent; font-weight: normal;
font-style: normal; text-decoration: none; vertical-align:
baseline;">$ git config --global -l</span></li>
<li style="list-style-type: circle; font-size: 11pt;
font-family: Arial; color: rgb(0, 0, 0); background-color:
transparent; font-weight: normal; font-style: normal;
text-decoration: none; vertical-align: baseline;"><span
style="font-size: 11pt; font-family: Arial; color: rgb(0, 0,
0); background-color: transparent; font-weight: normal;
font-style: normal; text-decoration: none; vertical-align:
baseline;">user.name=Geoffrey De Smet</span></li>
<li style="list-style-type: circle; font-size: 11pt;
font-family: Arial; color: rgb(0, 0, 0); background-color:
transparent; font-weight: normal; font-style: normal;
text-decoration: none; vertical-align: baseline;"><span
style="font-size: 11pt; font-family: Arial; color: rgb(0, 0,
0); background-color: transparent; font-weight: normal;
font-style: normal; text-decoration: none; vertical-align:
baseline;">user.email=ge0ffrey.spam@...</span></li>
</ul>
<li style="list-style-type: disc; font-size: 11pt; font-family:
Arial; color: rgb(0, 0, 0); background-color: transparent;
font-weight: normal; font-style: normal; text-decoration: none;
vertical-align: baseline;"><span style="font-size: 11pt;
font-family: Arial; color: rgb(0, 0, 0); background-color:
transparent; font-weight: normal; font-style: normal;
text-decoration: none; vertical-align: baseline;">6) Push your
public key to github:</span></li>
<ul>
<li style="list-style-type: circle; font-size: 11pt;
font-family: Arial; color: rgb(0, 0, 0); background-color:
transparent; font-weight: normal; font-style: normal;
text-decoration: none; vertical-align: baseline;"><span
style="font-size: 11pt; font-family: Arial; color: rgb(0, 0,
0); background-color: transparent; font-weight: normal;
font-style: normal; text-decoration: none; vertical-align:
baseline;">Follow the instructions on</span><a
href="http://github.com/guides/providing-your-ssh-key"><span
style="font-size: 11pt; font-family: Arial; color: rgb(0,
0, 0); background-color: transparent; font-weight: normal;
font-style: normal; text-decoration: none; vertical-align:
baseline;"> </span><span style="font-size: 11pt;
font-family: Arial; color: rgb(0, 0, 153);
background-color: transparent; font-weight: normal;
font-style: normal; text-decoration: underline;
vertical-align: baseline;">http://github.com/guides/providing-your-ssh-key</span></a><span
style="font-size: 11pt; font-family: Arial; color: rgb(0, 0,
0); background-color: transparent; font-weight: normal;
font-style: normal; text-decoration: none; vertical-align:
baseline;"></span></li>
</ul>
</ul>
<br>
<h3><span style="font-size: 14pt; font-family: Arial; color: rgb(0,
0, 0); background-color: transparent; font-weight: bold;
font-style: normal; text-decoration: none; vertical-align:
baseline;">Getting the source code locally</span></h3>
<span style="font-size: 11pt; font-family: Arial; color: rgb(0, 0,
0); background-color: transparent; font-weight: normal;
font-style: normal; text-decoration: none; vertical-align:
baseline;">First move your old SVN working directory aside, so
you’re not confused that you shouldn’t work there any more:</span><br>
<span style="font-size: 11pt; font-family: Arial; color: rgb(0, 0,
0); background-color: transparent; font-weight: normal;
font-style: normal; text-decoration: none; vertical-align:
baseline;">$ cd projects</span><br>
<span style="font-size: 11pt; font-family: Arial; color: rgb(0, 0,
0); background-color: transparent; font-weight: normal;
font-style: normal; text-decoration: none; vertical-align:
baseline;">$ mv drools drools-oldsvn</span><br>
<span style="font-size: 11pt; font-family: Arial; color: rgb(0, 0,
0); background-color: transparent; font-weight: normal;
font-style: normal; text-decoration: none; vertical-align:
baseline;"></span><br>
<span style="font-size: 11pt; font-family: Arial; color: rgb(0, 0,
0); background-color: transparent; font-weight: normal;
font-style: normal; text-decoration: none; vertical-align:
baseline;">Now you’re ready to get the sources with git. In SVN
this is a </span><span style="font-size: 11pt; font-family:
Arial; color: rgb(0, 0, 0); background-color: transparent;
font-weight: bold; font-style: normal; text-decoration: none;
vertical-align: baseline;">svn checkout</span><span
style="font-size: 11pt; font-family: Arial; color: rgb(0, 0, 0);
background-color: transparent; font-weight: normal; font-style:
normal; text-decoration: none; vertical-align: baseline;">, but in
Git this is called a </span><span style="font-size: 11pt;
font-family: Arial; color: rgb(0, 0, 0); background-color:
transparent; font-weight: bold; font-style: normal;
text-decoration: none; vertical-align: baseline;">git clone</span><span
style="font-size: 11pt; font-family: Arial; color: rgb(0, 0, 0);
background-color: transparent; font-weight: normal; font-style:
normal; text-decoration: none; vertical-align: baseline;">. Prefer
the faster, stabler git protocol over the slower https protocol:</span><br>
<span style="font-size: 11pt; font-family: Arial; color: rgb(0, 0,
0); background-color: transparent; font-weight: normal;
font-style: normal; text-decoration: none; vertical-align:
baseline;">$ git clone <a class="moz-txt-link-abbreviated" href="mailto:git@github.com:droolsjbpm/droolsjbpm.git">git@github.com:droolsjbpm/droolsjbpm.git</a>
droolsjbpm</span><br>
<span style="font-size: 11pt; font-family: Arial; color: rgb(0, 0,
0); background-color: transparent; font-weight: normal;
font-style: normal; text-decoration: none; vertical-align:
baseline;">Next go into that directory</span><br>
<span style="font-size: 11pt; font-family: Arial; color: rgb(0, 0,
0); background-color: transparent; font-weight: normal;
font-style: normal; text-decoration: none; vertical-align:
baseline;">$ cd droolsjbpm</span><br>
<span style="font-size: 11pt; font-family: Arial; color: rgb(0, 0,
0); background-color: transparent; font-weight: normal;
font-style: normal; text-decoration: none; vertical-align:
baseline;"></span><br>
<span style="font-size: 11pt; font-family: Arial; color: rgb(0, 0,
0); background-color: transparent; font-weight: normal;
font-style: normal; text-decoration: none; vertical-align:
baseline;">So what’s the command </span><span style="font-size:
11pt; font-family: Arial; color: rgb(0, 0, 0); background-color:
transparent; font-weight: normal; font-style: italic;
text-decoration: none; vertical-align: baseline;">git checkout</span><span
style="font-size: 11pt; font-family: Arial; color: rgb(0, 0, 0);
background-color: transparent; font-weight: normal; font-style:
normal; text-decoration: none; vertical-align: baseline;"> for? To
switch to another branch, but in the same working directory. In
SVN you also use </span><span style="font-size: 11pt;
font-family: Arial; color: rgb(0, 0, 0); background-color:
transparent; font-weight: normal; font-style: italic;
text-decoration: none; vertical-align: baseline;">svn checkout</span><span
style="font-size: 11pt; font-family: Arial; color: rgb(0, 0, 0);
background-color: transparent; font-weight: normal; font-style:
normal; text-decoration: none; vertical-align: baseline;"> for
that.</span><br>
<span style="font-size: 11pt; font-family: Arial; color: rgb(0, 0,
0); background-color: transparent; font-weight: bold; font-style:
italic; text-decoration: none; vertical-align: baseline;">Translation
note</span><span style="font-size: 11pt; font-family: Arial;
color: rgb(0, 0, 0); background-color: transparent; font-weight:
bold; font-style: normal; text-decoration: none; vertical-align:
baseline;">: svn checkout == git clone (new repository) OR git
checkout (change branch)</span><br>
<span style="font-size: 11pt; font-family: Arial; color: rgb(0, 0,
0); background-color: transparent; font-weight: normal;
font-style: normal; text-decoration: none; vertical-align:
baseline;"></span><br>
<span style="font-size: 11pt; font-family: Arial; color: rgb(0, 0,
0); background-color: transparent; font-weight: normal;
font-style: normal; text-decoration: none; vertical-align:
baseline;">Follow the instructions in the README.txt to set up
your Eclipse or IntelliJ again.</span><br>
<h3><span style="font-size: 14pt; font-family: Arial; color: rgb(0,
0, 0); background-color: transparent; font-weight: bold;
font-style: normal; text-decoration: none; vertical-align:
baseline;">Getting changes from others</span></h3>
<span style="font-size: 11pt; font-family: Arial; color: rgb(0, 0,
0); background-color: transparent; font-weight: normal;
font-style: normal; text-decoration: none; vertical-align:
baseline;">So Mark and Edson changed something in drools-core in
the reference repository. How do I get those changes? In SVN this
is </span><span style="font-size: 11pt; font-family: Arial;
color: rgb(0, 0, 0); background-color: transparent; font-weight:
bold; font-style: normal; text-decoration: none; vertical-align:
baseline;">svn update</span><span style="font-size: 11pt;
font-family: Arial; color: rgb(0, 0, 0); background-color:
transparent; font-weight: normal; font-style: normal;
text-decoration: none; vertical-align: baseline;">, but in Git
this is a </span><span style="font-size: 11pt; font-family:
Arial; color: rgb(0, 0, 0); background-color: transparent;
font-weight: bold; font-style: normal; text-decoration: none;
vertical-align: baseline;">git pull</span><span style="font-size:
11pt; font-family: Arial; color: rgb(0, 0, 0); background-color:
transparent; font-weight: normal; font-style: normal;
text-decoration: none; vertical-align: baseline;">.</span><br>
<span style="font-size: 11pt; font-family: Arial; color: rgb(0, 0,
0); background-color: transparent; font-weight: normal;
font-style: normal; text-decoration: none; vertical-align:
baseline;">$ git pull</span><br>
<span style="font-size: 11pt; font-family: Arial; color: rgb(0, 0,
0); background-color: transparent; font-weight: bold; font-style:
italic; text-decoration: none; vertical-align: baseline;">Translation
note</span><span style="font-size: 11pt; font-family: Arial;
color: rgb(0, 0, 0); background-color: transparent; font-weight:
bold; font-style: normal; text-decoration: none; vertical-align:
baseline;">: svn update == git pull</span><span style="font-size:
11pt; font-family: Arial; color: rgb(0, 0, 0); background-color:
transparent; font-weight: normal; font-style: normal;
text-decoration: none; vertical-align: baseline;"></span><br>
<h3><span style="font-size: 14pt; font-family: Arial; color: rgb(0,
0, 0); background-color: transparent; font-weight: bold;
font-style: normal; text-decoration: none; vertical-align:
baseline;">Making changes</span></h3>
<span style="font-size: 11pt; font-family: Arial; color: rgb(0, 0,
0); background-color: transparent; font-weight: normal;
font-style: normal; text-decoration: none; vertical-align:
baseline;">While making your changes, do the same as in SVN: </span><span
style="font-size: 11pt; font-family: Arial; color: rgb(0, 0, 0);
background-color: transparent; font-weight: bold; font-style:
normal; text-decoration: none; vertical-align: baseline;">git add</span><span
style="font-size: 11pt; font-family: Arial; color: rgb(0, 0, 0);
background-color: transparent; font-weight: normal; font-style:
normal; text-decoration: none; vertical-align: baseline;">, </span><span
style="font-size: 11pt; font-family: Arial; color: rgb(0, 0, 0);
background-color: transparent; font-weight: bold; font-style:
normal; text-decoration: none; vertical-align: baseline;">git rm</span><span
style="font-size: 11pt; font-family: Arial; color: rgb(0, 0, 0);
background-color: transparent; font-weight: normal; font-style:
normal; text-decoration: none; vertical-align: baseline;">
(instead of svn delete), </span><span style="font-size: 11pt;
font-family: Arial; color: rgb(0, 0, 0); background-color:
transparent; font-weight: bold; font-style: normal;
text-decoration: none; vertical-align: baseline;">git status</span><span
style="font-size: 11pt; font-family: Arial; color: rgb(0, 0, 0);
background-color: transparent; font-weight: normal; font-style:
normal; text-decoration: none; vertical-align: baseline;">.</span><br>
<span style="font-size: 11pt; font-family: Arial; color: rgb(0, 0,
0); background-color: transparent; font-weight: bold; font-style:
italic; text-decoration: none; vertical-align: baseline;">Translation
note</span><span style="font-size: 11pt; font-family: Arial;
color: rgb(0, 0, 0); background-color: transparent; font-weight:
bold; font-style: normal; text-decoration: none; vertical-align:
baseline;">: svn delete = git rm</span><span style="font-size:
11pt; font-family: Arial; color: rgb(0, 0, 0); background-color:
transparent; font-weight: normal; font-style: normal;
text-decoration: none; vertical-align: baseline;"></span><br>
<span style="font-size: 11pt; font-family: Arial; color: rgb(0, 0,
0); background-color: transparent; font-weight: normal;
font-style: normal; text-decoration: none; vertical-align:
baseline;"></span><br>
<span style="font-size: 11pt; font-family: Arial; color: rgb(0, 0,
0); background-color: transparent; font-weight: normal;
font-style: normal; text-decoration: none; vertical-align:
baseline;">After making your changes, you ‘ll want to do a </span><span
style="font-size: 11pt; font-family: Arial; color: rgb(0, 0, 0);
background-color: transparent; font-weight: bold; font-style:
normal; text-decoration: none; vertical-align: baseline;">git
commit</span><span style="font-size: 11pt; font-family: Arial;
color: rgb(0, 0, 0); background-color: transparent; font-weight:
normal; font-style: normal; text-decoration: none; vertical-align:
baseline;"> (when you’re done with a changeset) and a </span><span
style="font-size: 11pt; font-family: Arial; color: rgb(0, 0, 0);
background-color: transparent; font-weight: bold; font-style:
normal; text-decoration: none; vertical-align: baseline;">git push</span><span
style="font-size: 11pt; font-family: Arial; color: rgb(0, 0, 0);
background-color: transparent; font-weight: normal; font-style:
normal; text-decoration: none; vertical-align: baseline;"> (to
share those changes with the rest of the team). To recap: doing a
</span><span style="font-size: 11pt; font-family: Arial; color:
rgb(0, 0, 0); background-color: transparent; font-weight: normal;
font-style: italic; text-decoration: none; vertical-align:
baseline;">git commit</span><span style="font-size: 11pt;
font-family: Arial; color: rgb(0, 0, 0); background-color:
transparent; font-weight: normal; font-style: normal;
text-decoration: none; vertical-align: baseline;"> does not push
your changes to the remote repository yet, you also need to do a </span><span
style="font-size: 11pt; font-family: Arial; color: rgb(0, 0, 0);
background-color: transparent; font-weight: normal; font-style:
italic; text-decoration: none; vertical-align: baseline;">git push</span><span
style="font-size: 11pt; font-family: Arial; color: rgb(0, 0, 0);
background-color: transparent; font-weight: normal; font-style:
normal; text-decoration: none; vertical-align: baseline;">.</span><br>
<span style="font-size: 11pt; font-family: Arial; color: rgb(0, 0,
0); background-color: transparent; font-weight: normal;
font-style: normal; text-decoration: none; vertical-align:
baseline;">$ git commit -m “JBRULES-123 fix testcase”</span><br>
<span style="font-size: 11pt; font-family: Arial; color: rgb(0, 0,
0); background-color: transparent; font-weight: normal;
font-style: normal; text-decoration: none; vertical-align:
baseline;">$ git push</span><br>
<span style="font-size: 11pt; font-family: Arial; color: rgb(0, 0,
0); background-color: transparent; font-weight: bold; font-style:
italic; text-decoration: none; vertical-align: baseline;">Translation
note</span><span style="font-size: 11pt; font-family: Arial;
color: rgb(0, 0, 0); background-color: transparent; font-weight:
bold; font-style: normal; text-decoration: none; vertical-align:
baseline;">: svn commit == git commit + git push</span><span
style="font-size: 11pt; font-family: Arial; color: rgb(0, 0, 0);
background-color: transparent; font-weight: normal; font-style:
normal; text-decoration: none; vertical-align: baseline;"></span><br>
<h2><span style="font-size: 18pt; font-family: Arial; color: rgb(0,
0, 0); background-color: transparent; font-weight: bold;
font-style: normal; text-decoration: none; vertical-align:
baseline;">Part 2: Tell me more</span></h2>
<h3><span style="font-size: 14pt; font-family: Arial; color: rgb(0,
0, 0); background-color: transparent; font-weight: bold;
font-style: normal; text-decoration: none; vertical-align:
baseline;">Extra terminology</span></h3>
<span style="font-size: 11pt; font-family: Arial; color: rgb(0, 0,
0); background-color: transparent; font-weight: normal;
font-style: normal; text-decoration: none; vertical-align:
baseline;">What is </span><span style="font-size: 11pt;
font-family: Arial; color: rgb(0, 0, 0); background-color:
transparent; font-weight: normal; font-style: italic;
text-decoration: none; vertical-align: baseline;">rebasing</span><span
style="font-size: 11pt; font-family: Arial; color: rgb(0, 0, 0);
background-color: transparent; font-weight: normal; font-style:
normal; text-decoration: none; vertical-align: baseline;">? A </span><span
style="font-size: 11pt; font-family: Arial; color: rgb(0, 0, 0);
background-color: transparent; font-weight: normal; font-style:
italic; text-decoration: none; vertical-align: baseline;">rebase</span><span
style="font-size: 11pt; font-family: Arial; color: rgb(0, 0, 0);
background-color: transparent; font-weight: normal; font-style:
normal; text-decoration: none; vertical-align: baseline;"> is an
alternative manner of merging: instead of merging your changes
with the incoming changes, it takes the incoming changes and
applies your changes on top of that. For example:</span><br>
<span style="font-size: 11pt; font-family: Arial; color: rgb(0, 0,
0); background-color: transparent; font-weight: normal;
font-style: normal; text-decoration: none; vertical-align:
baseline;">$ git pull --rebase</span><br>
<span style="font-size: 11pt; font-family: Arial; color: rgb(0, 0,
0); background-color: transparent; font-weight: normal;
font-style: normal; text-decoration: none; vertical-align:
baseline;"></span><br>
<span style="font-size: 11pt; font-family: Arial; color: rgb(0, 0,
0); background-color: transparent; font-weight: normal;
font-style: normal; text-decoration: none; vertical-align:
baseline;">What is </span><span style="font-size: 11pt;
font-family: Arial; color: rgb(0, 0, 0); background-color:
transparent; font-weight: normal; font-style: italic;
text-decoration: none; vertical-align: baseline;">origin</span><span
style="font-size: 11pt; font-family: Arial; color: rgb(0, 0, 0);
background-color: transparent; font-weight: normal; font-style:
normal; text-decoration: none; vertical-align: baseline;">?
Because git can work with multiple remote repositories (usually
forks of the same project), the default remote repository is known
as </span><span style="font-size: 11pt; font-family: Arial;
color: rgb(0, 0, 0); background-color: transparent; font-weight:
normal; font-style: italic; text-decoration: none; vertical-align:
baseline;">origin</span><span style="font-size: 11pt; font-family:
Arial; color: rgb(0, 0, 0); background-color: transparent;
font-weight: normal; font-style: normal; text-decoration: none;
vertical-align: baseline;">. If you’ve cloned the reference
repository, then </span><span style="font-size: 11pt;
font-family: Arial; color: rgb(0, 0, 0); background-color:
transparent; font-weight: normal; font-style: italic;
text-decoration: none; vertical-align: baseline;">origin</span><span
style="font-size: 11pt; font-family: Arial; color: rgb(0, 0, 0);
background-color: transparent; font-weight: normal; font-style:
normal; text-decoration: none; vertical-align: baseline;"> is the
reference repository. If you’ve forked the reference repository as
A and cloned A, then </span><span style="font-size: 11pt;
font-family: Arial; color: rgb(0, 0, 0); background-color:
transparent; font-weight: normal; font-style: italic;
text-decoration: none; vertical-align: baseline;">origin</span><span
style="font-size: 11pt; font-family: Arial; color: rgb(0, 0, 0);
background-color: transparent; font-weight: normal; font-style:
normal; text-decoration: none; vertical-align: baseline;"> is A.</span><br>
<h3><span style="font-size: 14pt; font-family: Arial; color: rgb(0,
0, 0); background-color: transparent; font-weight: bold;
font-style: normal; text-decoration: none; vertical-align:
baseline;">Branching</span></h3>
<span style="font-size: 11pt; font-family: Arial; color: rgb(0, 0,
0); background-color: transparent; font-weight: normal;
font-style: normal; text-decoration: none; vertical-align:
baseline;">Usually we’ll have 2 types of branches: release
branches and topic branches.</span><br>
<span style="font-size: 11pt; font-family: Arial; color: rgb(0, 0,
0); background-color: transparent; font-weight: normal;
font-style: normal; text-decoration: none; vertical-align:
baseline;">To switch to another branch, just use </span><span
style="font-size: 11pt; font-family: Arial; color: rgb(0, 0, 0);
background-color: transparent; font-weight: bold; font-style:
normal; text-decoration: none; vertical-align: baseline;">git
checkout</span><span style="font-size: 11pt; font-family: Arial;
color: rgb(0, 0, 0); background-color: transparent; font-weight:
normal; font-style: normal; text-decoration: none; vertical-align:
baseline;">:</span><br>
<span style="font-size: 11pt; font-family: Arial; color: rgb(0, 0,
0); background-color: transparent; font-weight: normal;
font-style: normal; text-decoration: none; vertical-align:
baseline;">$ git checkout 5.1.x</span><br>
<span style="font-size: 11pt; font-family: Arial; color: rgb(0, 0,
0); background-color: transparent; font-weight: normal;
font-style: normal; text-decoration: none; vertical-align:
baseline;"></span><br>
<span style="font-size: 11pt; font-family: Arial; color: rgb(0, 0,
0); background-color: transparent; font-weight: normal;
font-style: normal; text-decoration: none; vertical-align:
baseline;">To create a branch do:</span><br>
<span style="font-size: 11pt; font-family: Arial; color: rgb(0, 0,
0); background-color: transparent; font-weight: normal;
font-style: normal; text-decoration: none; vertical-align:
baseline;">$ git checkout -b 5.2.x</span><br>
<h3><span style="font-size: 14pt; font-family: Arial; color: rgb(0,
0, 0); background-color: transparent; font-weight: bold;
font-style: normal; text-decoration: none; vertical-align:
baseline;">Release branching</span></h3>
<span style="font-size: 11pt; font-family: Arial; color: rgb(0, 0,
0); background-color: transparent; font-weight: normal;
font-style: normal; text-decoration: none; vertical-align:
baseline;">A release branches is copied from the master branch and
only receives bug-fixes. It is separated from the master branch so
no unstable features or improvements (pushed by other developers)
leak in.</span><br>
<span style="font-size: 11pt; font-family: Arial; color: rgb(0, 0,
0); background-color: transparent; font-weight: normal;
font-style: normal; text-decoration: none; vertical-align:
baseline;">For example: $ git checkout 5.1.x</span><br>
<span style="font-size: 11pt; font-family: Arial; color: rgb(0, 0,
0); background-color: transparent; font-weight: normal;
font-style: normal; text-decoration: none; vertical-align:
baseline;"></span><br>
<span style="font-size: 11pt; font-family: Arial; color: rgb(0, 0,
0); background-color: transparent; font-weight: normal;
font-style: italic; text-decoration: none; vertical-align:
baseline;">Cherry picking</span><span style="font-size: 11pt;
font-family: Arial; color: rgb(0, 0, 0); background-color:
transparent; font-weight: normal; font-style: normal;
text-decoration: none; vertical-align: baseline;"> is very
interesting to pick bug-fixes from the master branch into the
release branch.</span><br>
<h3><span style="font-size: 14pt; font-family: Arial; color: rgb(0,
0, 0); background-color: transparent; font-weight: bold;
font-style: normal; text-decoration: none; vertical-align:
baseline;">Topic branching</span></h3>
<span style="font-size: 11pt; font-family: Arial; color: rgb(0, 0,
0); background-color: transparent; font-weight: normal;
font-style: normal; text-decoration: none; vertical-align:
baseline;">A topic branch is copied from the master branch and is
eventually merged back into the master branch. Its changes are to
disruptive to other team members to be committed to the master
immediately.</span><br>
<span style="font-size: 11pt; font-family: Arial; color: rgb(0, 0,
0); background-color: transparent; font-weight: normal;
font-style: normal; text-decoration: none; vertical-align:
baseline;">For example: $ git checkout trueModify</span><br>
<span style="font-size: 11pt; font-family: Arial; color: rgb(0, 0,
0); background-color: transparent; font-weight: normal;
font-style: normal; text-decoration: none; vertical-align:
baseline;"></span><br>
<span style="font-size: 11pt; font-family: Arial; color: rgb(0, 0,
0); background-color: transparent; font-weight: normal;
font-style: italic; text-decoration: none; vertical-align:
baseline;">Rebasing</span><span style="font-size: 11pt;
font-family: Arial; color: rgb(0, 0, 0); background-color:
transparent; font-weight: normal; font-style: normal;
text-decoration: none; vertical-align: baseline;"> is very
interesting when you’re working on an experimental feature in a </span><span
style="font-size: 11pt; font-family: Arial; color: rgb(0, 0, 0);
background-color: transparent; font-weight: normal; font-style:
italic; text-decoration: none; vertical-align: baseline;">topic</span><span
style="font-size: 11pt; font-family: Arial; color: rgb(0, 0, 0);
background-color: transparent; font-weight: normal; font-style:
normal; text-decoration: none; vertical-align: baseline;"> branch
for the last few weeks and you want to have the latest changes of
master(=trunk) in there too (= sync up with master):</span><br>
<span style="font-size: 11pt; font-family: Arial; color: rgb(0, 0,
0); background-color: transparent; font-weight: normal;
font-style: normal; text-decoration: none; vertical-align:
baseline;">// on my the myTopic branch</span><br>
<span style="font-size: 11pt; font-family: Arial; color: rgb(0, 0,
0); background-color: transparent; font-weight: normal;
font-style: normal; text-decoration: none; vertical-align:
baseline;">$ git rebase master</span><br>
<span style="font-size: 11pt; font-family: Arial; color: rgb(0, 0,
0); background-color: transparent; font-weight: normal;
font-style: normal; text-decoration: none; vertical-align:
baseline;"></span><br>
<span style="font-size: 11pt; font-family: Arial; color: rgb(0, 0,
0); background-color: transparent; font-weight: normal;
font-style: normal; text-decoration: none; vertical-align:
baseline;">After your topic branch is stable, you’ll merge it into
the master branch:</span><br>
<span style="font-size: 11pt; font-family: Arial; color: rgb(0, 0,
0); background-color: transparent; font-weight: normal;
font-style: normal; text-decoration: none; vertical-align:
baseline;">$ git checkout master</span><br>
<span style="font-size: 11pt; font-family: Arial; color: rgb(0, 0,
0); background-color: transparent; font-weight: normal;
font-style: normal; text-decoration: none; vertical-align:
baseline;">$ git merge trueModify</span><br>
<h2><span style="font-size: 18pt; font-family: Arial; color: rgb(0,
0, 0); background-color: transparent; font-weight: bold;
font-style: normal; text-decoration: none; vertical-align:
baseline;">Learn more</span></h2>
<span style="font-size: 11pt; font-family: Arial; color: rgb(0, 0,
0); background-color: transparent; font-weight: normal;
font-style: normal; text-decoration: none; vertical-align:
baseline;">Do you want to </span><span style="font-size: 11pt;
font-family: Arial; color: rgb(0, 0, 0); background-color:
transparent; font-weight: normal; font-style: italic;
text-decoration: none; vertical-align: baseline;">really</span><span
style="font-size: 11pt; font-family: Arial; color: rgb(0, 0, 0);
background-color: transparent; font-weight: normal; font-style:
normal; text-decoration: none; vertical-align: baseline;"> learn
Git?</span><br>
<span style="font-size: 11pt; font-family: Arial; color: rgb(0, 0,
0); background-color: transparent; font-weight: bold; font-style:
normal; text-decoration: none; vertical-align: baseline;">Read the
Pro Git book (freely available online):</span><span
style="font-size: 11pt; font-family: Arial; color: rgb(0, 0, 0);
background-color: transparent; font-weight: normal; font-style:
normal; text-decoration: none; vertical-align: baseline;"> </span><a
href="http://progit.org/book/"><span style="font-size: 11pt;
font-family: Arial; color: rgb(0, 0, 153); background-color:
transparent; font-weight: bold; font-style: normal;
text-decoration: underline; vertical-align: baseline;">http://progit.org/book/</span></a><span
style="font-size: 11pt; font-family: Arial; color: rgb(0, 0, 0);
background-color: transparent; font-weight: normal; font-style:
normal; text-decoration: none; vertical-align: baseline;"></span><br>
<span style="font-size: 11pt; font-family: Arial; color: rgb(0, 0,
0); background-color: transparent; font-weight: normal;
font-style: normal; text-decoration: none; vertical-align:
baseline;">You’ll easily gain the time you spend reading that
book, because Git is more than SVN++.</span><br>
<span style="font-size: 11pt; font-family: Arial; color: rgb(0, 0,
0); background-color: transparent; font-weight: normal;
font-style: normal; text-decoration: none; vertical-align:
baseline;">Read that book, especially if you’re going to do
branching and merging!</span><br>
<span style="font-size: 11pt; font-family: Arial; color: rgb(0, 0,
0); background-color: transparent; font-weight: normal;
font-style: normal; text-decoration: none; vertical-align:
baseline;">Other references: </span><a
href="http://in.relation.to/Bloggers/HibernateMovesToGitGitTipsAndTricks"><span
style="font-size: 11pt; font-family: Arial; color: rgb(0, 0,
153); background-color: transparent; font-weight: normal;
font-style: normal; text-decoration: underline; vertical-align:
baseline;">Hibernate git tricks</span></a><span
style="font-size: 11pt; font-family: Arial; color: rgb(0, 0, 0);
background-color: transparent; font-weight: normal; font-style:
normal; text-decoration: none; vertical-align: baseline;">, </span><a
href="http://git-scm.com/course/svn.html"><span style="font-size:
11pt; font-family: Arial; color: rgb(0, 0, 153);
background-color: transparent; font-weight: normal; font-style:
normal; text-decoration: underline; vertical-align: baseline;">SVN
crash course</span></a><span style="font-size: 11pt;
font-family: Arial; color: rgb(0, 0, 0); background-color:
transparent; font-weight: normal; font-style: normal;
text-decoration: none; vertical-align: baseline;">, </span><a
href="http://live.gnome.org/Git/Developers"><span
style="font-size: 11pt; font-family: Arial; color: rgb(0, 0,
153); background-color: transparent; font-weight: normal;
font-style: normal; text-decoration: underline; vertical-align:
baseline;">Git for Gnome developers</span></a><span
style="font-size: 11pt; font-family: Arial; color: rgb(0, 0, 0);
background-color: transparent; font-weight: normal; font-style:
normal; text-decoration: none; vertical-align: baseline;">, ...</span>
<pre class="moz-signature" cols="72">--
With kind regards,
Geoffrey De Smet</pre>
</body>
</html>