285 lines
No EOL
12 KiB
HTML
285 lines
No EOL
12 KiB
HTML
<?xml version="1.0" encoding="utf-8"?>
|
|
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
|
|
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
|
|
<html xmlns="http://www.w3.org/1999/xhtml" lang="fr" xml:lang="fr">
|
|
<head>
|
|
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
|
|
|
|
|
|
<meta name="keywords" content="git">
|
|
|
|
<link rel="shortcut icon" type="image/x-icon" href="/Scratch/img/favicon.ico" />
|
|
<link rel="stylesheet" type="text/css" href="/Scratch/assets/css/main.css" />
|
|
<link rel="stylesheet" type="text/css" href="/Scratch/css/twilight.css" />
|
|
<link rel="stylesheet" type="text/css" href="/Scratch/css/idc.css" />
|
|
<link rel="alternate" type="application/rss+xml" title="RSS" href="http://feeds.feedburner.com/yannespositocomen"/>
|
|
|
|
<link rel="alternate" lang="fr" xml:lang="fr" title="Git pour les nuls" type="text/html" hreflang="fr" href="/Scratch/fr/blog/2009-11-12-Git-for-n00b/c-est-parti-pour-l-aventure/" />
|
|
<link rel="alternate" lang="en" xml:lang="en" title="Git for n00b" type="text/html" hreflang="en" href="/Scratch/en/blog/2009-11-12-Git-for-n00b/c-est-parti-pour-l-aventure/" />
|
|
<script type="text/javascript" src="/Scratch/js/jquery-1.3.1.min.js"></script>
|
|
<script type="text/javascript" src="/Scratch/js/jquery.cookie.js"></script>
|
|
<script type="text/javascript" src="/Scratch/js/index.js"></script>
|
|
|
|
<title>Git for n00b</title>
|
|
</head>
|
|
<body lang="en">
|
|
<script type="text/javascript">// <![CDATA[
|
|
document.write('<div id="blackpage"><img src="/Scratch/img/loading.gif" alt="loading..."/></div>');
|
|
// ]]>
|
|
</script>
|
|
|
|
<div id="content">
|
|
<div id="choix">
|
|
<div class="return"><a href="#entete">↓ Menu ↓</a></div>
|
|
<div id="choixlang">
|
|
<a href="/Scratch/fr/blog/2009-11-12-Git-for-n00b/c-est-parti-pour-l-aventure/" onclick="setLanguage('fr')">Version Française</a>
|
|
</div>
|
|
</div>
|
|
|
|
<div id="titre">
|
|
<h1>
|
|
Git for n00b
|
|
</h1>
|
|
|
|
<h2>
|
|
The Adventure Begins
|
|
</h2>
|
|
|
|
</div>
|
|
|
|
<div class="flush"></div>
|
|
|
|
|
|
|
|
<div id="sousliens"><ul><li><a href="/Scratch/en/blog/2009-11-12-Git-for-n00b/">introduction</a></li><li><a href="/Scratch/en/blog/2009-11-12-Git-for-n00b/Git-pour-quoi-faire/">Git for what?</a></li><li><a href="/Scratch/en/blog/2009-11-12-Git-for-n00b/conf-et-install/">Configure before Use</a></li><li><span class="active" title="You're here.">The Adventure Begins</span></li><li><a href="/Scratch/en/blog/2009-11-12-Git-for-n00b/comprendre/">Understanding</a></li><li><a href="/Scratch/en/blog/2009-11-12-Git-for-n00b/commandes-avancees/">Command List</a></li></ul></div>
|
|
|
|
<div class="flush"></div>
|
|
<div id="afterheader">
|
|
<div class="corps">
|
|
<h1 class="first" id="here-we-go">Here we go!</h1>
|
|
|
|
<p>Here is one from many way to use <a href="http://git-scm.org" title="Git">Git</a>. This method is sufficient to work on a project. Not there is many other <em>workflows</em>.</p>
|
|
|
|
<h2 id="basic-usage">Basic usage</h2>
|
|
|
|
<p>Work with <a href="http://git-scm.org" title="Git">Git</a> immediately:</p>
|
|
|
|
<ul>
|
|
<li>Get modification done by others <span class="black"><code>git pull</code></span>,</li>
|
|
<li>See details of these modifications <span class="black"><code>git log</code></span>,</li>
|
|
<li>Many times:
|
|
<ul>
|
|
<li><em>Make an atomic modification</em></li>
|
|
<li>Verify details of this modification: <span class="black"><code>git status</code></span> and <span class="black"><code>git diff</code></span>,</li>
|
|
<li>Add some file to be versionned if necessary:<br /><span class="black"><code>git add [file]</code></span>,</li>
|
|
<li>Save you modifications <br /><span class="black"><code>git commit -a -m "message"</code></span>,</li>
|
|
<li>Send your modifications to others: <span class="black"><code>git push</code></span> (redo a <code>git pull</code> if push return an error).</li>
|
|
</ul>
|
|
</li>
|
|
</ul>
|
|
|
|
<p>With these few commands you can use <a href="http://git-scm.org" title="Git">Git</a>. Even if it is sufficient, you need to know one more thing before really begin ; How to manage <em>conflicts</em>.</p>
|
|
|
|
<h3 id="conflicts-management">Conflicts management</h3>
|
|
|
|
<p>Conflicts can arise when you change the same line of code on the same file from another branch you’re merging. It can seems a bit intimidating, but with <a href="http://git-scm.org" title="Git">Git</a> this kind of thing is really simple to handle.</p>
|
|
|
|
<h4 id="example">example</h4>
|
|
|
|
<p>You start from the following file</p>
|
|
|
|
<div style="width: 18em; margin-left: auto; margin-right: auto">
|
|
<pre class="twilight">
|
|
Zoot
|
|
</pre>
|
|
</div>
|
|
|
|
<p>and you modify one line</p>
|
|
|
|
<div style="width: 18em; margin-left: auto; margin-right: auto">
|
|
<pre class="twilight">
|
|
Zoot <span class="Constant"><strong>the pure</strong></span>
|
|
</pre>
|
|
</div>
|
|
|
|
<p>except during this time, another user had also modified the same line and had done a <code>push</code>.</p>
|
|
|
|
<div style="width: 18em; margin-left: auto; margin-right: auto">
|
|
<pre class="twilight">
|
|
Zoot<span class="StringConstant"><strong>, just Zoot</strong></span>
|
|
</pre>
|
|
</div>
|
|
|
|
<p>Now when you do a:</p>
|
|
|
|
<div>
|
|
<pre class="twilight">
|
|
$ git pull
|
|
remote: Counting objects: 5, <span class="Keyword">done</span>.
|
|
remote: Total 3 (delta 0), reused 0 (delta 0)
|
|
Unpacking objects: 100% (3/3), <span class="Keyword">done</span>.
|
|
From /home/e640846/tmp/conflictTest
|
|
d3ea395..2dc7ffb master -<span class="Keyword">></span> origin/master
|
|
Auto-merging foo
|
|
CONFLICT (content): Merge conflict <span class="Keyword">in</span> foo
|
|
Automatic merge failed<span class="Keyword">;</span> fix conflicts and <span class="Keyword">then</span> commit the result.
|
|
</pre>
|
|
</div>
|
|
|
|
<p>Our file <code>foo</code> now contains: </p>
|
|
|
|
<div>
|
|
<pre class="twilight">
|
|
<<<<<<< HEAD:foo
|
|
Zoot <span class="Constant"><strong>the pure</strong></span>
|
|
=======
|
|
<span>Zoot<span class="StringConstant"><strong>, just Zoot</strong></span></span>
|
|
>>>>>>> 2dc7ffb0f186a407a1814d1a62684342cd54e7d6:foo
|
|
</pre>
|
|
</div>
|
|
|
|
<h4 id="conflict-resolution">Conflict resolution</h4>
|
|
|
|
<p>To resolve the conflict you only have to edit the file for example, writing:</p>
|
|
|
|
<div style="width: 18em; margin-left: auto; margin-right: auto">
|
|
<pre class="twilight">
|
|
Zoot <span class="Constant"><strong>the not so pure</strong></span>
|
|
</pre>
|
|
</div>
|
|
|
|
<p>and to commit</p>
|
|
|
|
<div>
|
|
<pre class="twilight">
|
|
git commit -a -m <span class="String"><span class="String">"</span>conflict resolved<span class="String">"</span></span>
|
|
</pre>
|
|
</div>
|
|
|
|
<p>Now you’re ready to use <a href="http://git-scm.org" title="Git">Git</a>.
|
|
<a href="http://git-scm.org" title="Git">Git</a> provide many other functionnalities. Now we’ll see some <a href="http://git-scm.org" title="Git">Git</a> usages older CVS couldn’t handle.</p>
|
|
|
|
|
|
</div>
|
|
|
|
|
|
<div class="navigation">
|
|
<div class="navigationprev"><a href="/Scratch/en/blog/2009-11-12-Git-for-n00b/conf-et-install/">previous ←</a></div>
|
|
<div class="navigationnext"><a href="/Scratch/en/blog/2009-11-12-Git-for-n00b/comprendre/">→ next</a></div>
|
|
</div>
|
|
<div class="flush"></div>
|
|
|
|
|
|
<div id="choixrss">
|
|
<a id="rss" href="http://feeds.feedburner.com/yannespositocomen">
|
|
Subscribe
|
|
</a>
|
|
</div>
|
|
<script type="text/javascript">
|
|
$(document).ready(function(){
|
|
$('#comment').hide();
|
|
$('#clickcomment').click(showComments);
|
|
});
|
|
function showComments() {
|
|
$('#comment').show();
|
|
$('#clickcomment').fadeOut();
|
|
}
|
|
document.write('<div id="clickcomment">Comments</div>');
|
|
</script>
|
|
<div class="flush"></div>
|
|
<div class="corps" id="comment">
|
|
<h2 class="first">comments</h2>
|
|
<noscript>
|
|
Vous devez activer javascript pour commenter.
|
|
</noscript>
|
|
|
|
<script type="text/javascript">
|
|
var idcomments_acct = 'a307f0044511ff1b5cfca573fc0a52e7';
|
|
var idcomments_post_id = '/Scratch/en/blog/2009-11-12-Git-for-n00b/';
|
|
var idcomments_post_url = 'http://yannesposito.com/Scratch/en/blog/2009-11-12-Git-for-n00b/';
|
|
</script>
|
|
<span id="IDCommentsPostTitle" style="display:none"></span>
|
|
<script type='text/javascript' src='/Scratch/js/genericCommentWrapperV2.js'></script>
|
|
|
|
</div>
|
|
|
|
<div id="entete" class="corps_spaced">
|
|
<div id="liens">
|
|
<ul><li><a href="/Scratch/en/">Homepage</a></li>
|
|
<li><a href="/Scratch/en/blog/">Blog</a></li>
|
|
<li><a href="/Scratch/en/about/">About</a></li>
|
|
<li><a href="/Scratch/en/contact/">Contact</a></li></ul>
|
|
</div>
|
|
<div class="flush"></div>
|
|
<hr/>
|
|
<div id="next_before_articles">
|
|
<div id="previous_articles">
|
|
previous entries
|
|
|
|
<div class="previous_article">
|
|
<a href="/Scratch/en/blog/2009-10-30-How-to-handle-evil-IE/">← How to handle evil IE</a>
|
|
</div>
|
|
|
|
|
|
<div class="previous_article">
|
|
<a href="/Scratch/en/blog/2009-10-28-custom-website-synchronisation-with-mobileme--2-/">← custom website synchronisation with mobileme (2)</a>
|
|
</div>
|
|
|
|
|
|
<div class="previous_article">
|
|
<a href="/Scratch/en/blog/2009-10-Wait-to-hide-a-menu-in-jQuery/">← Menu waiting to hide himself</a>
|
|
</div>
|
|
|
|
|
|
</div>
|
|
<div id="next_articles">
|
|
next entries
|
|
|
|
<div class="next_article">
|
|
<a href="/Scratch/en/blog/2009-12-06-iphone-call-filter/">iphone call filter→ </a>
|
|
</div>
|
|
|
|
|
|
<div class="next_article">
|
|
<a href="/Scratch/en/blog/2009-12-14-Git-vs--Bzr/">Git vs. Bzr→ </a>
|
|
</div>
|
|
|
|
|
|
<div class="next_article">
|
|
<a href="/Scratch/en/blog/2010-01-04-Change-default-shell-on-Mac-OS-X/">Change default shell on Mac OS X→ </a>
|
|
</div>
|
|
|
|
|
|
</div>
|
|
<div class="flush"></div>
|
|
</div>
|
|
</div>
|
|
|
|
|
|
<div id="bottom">
|
|
<div>
|
|
<a rel="license" href="http://creativecommons.org/licenses/by-sa/3.0/">Copyright ©, Yann Esposito</a>
|
|
</div>
|
|
<div id="lastmod">
|
|
Created: 11/12/2009 <br/>
|
|
Last modified: 07/15/2010
|
|
</div>
|
|
<div>
|
|
Entirely done with
|
|
<a href="http://www.vim.org">Vim</a>
|
|
and
|
|
<a href="http://nanoc.stoneship.org">nanoc</a>
|
|
</div>
|
|
<div>
|
|
<a href="/Scratch/en/validation/">Validation</a>
|
|
<a href="http://validator.w3.org/check?uri=referer"> [xhtml] </a>
|
|
.
|
|
<a href="http://jigsaw.w3.org/css-validator/check/referer?profile=css3"> [css] </a>
|
|
.
|
|
<a href="http://validator.w3.org/feed/check.cgi?url=http%3A//yannesposito.com/Scratch/en/blog/feed/feed.xml">[rss]</a>
|
|
</div>
|
|
</div>
|
|
<div class="clear"></div>
|
|
</div>
|
|
</body>
|
|
</html> |