2011-04-20 12:29:01 +00:00
<?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" >
2011-04-20 13:56:52 +00:00
< 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" / >
2012-04-02 21:43:39 +00:00
< link rel = "stylesheet" type = "text/css" href = "/Scratch/css/solarized.css" / >
2011-04-20 13:56:52 +00:00
< link rel = "stylesheet" type = "text/css" href = "/Scratch/css/idc.css" / >
2012-05-02 15:43:56 +00:00
< link href = 'http://fonts.googleapis.com/css?family=Inconsolata' rel = 'stylesheet' type = 'text/css' >
2011-04-20 12:29:01 +00:00
< link rel = "alternate" type = "application/rss+xml" title = "RSS" href = "http://feeds.feedburner.com/yannespositocomen" / >
2011-04-20 13:56:52 +00:00
< 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 >
2012-05-02 15:43:56 +00:00
< script type = "text/javascript" src = "/Scratch/js/highlight/highlight.pack.js" > < / script >
< script type = "text/javascript" src = "/Scratch/js/article.js" > < / script >
2011-04-20 12:29:01 +00:00
<!-- [if lt IE 9]>
< script src = "http://ie7-js.googlecode.com/svn/version/2.1(beta4)/IE9.js" > < / script >
<![endif]-->
< title > Git for n00b< / title >
< / head >
2011-10-18 22:30:00 +00:00
< body lang = "en" class = "article" >
2011-04-20 12:29:01 +00:00
< script type = "text/javascript" > / / < ! [ C D A T A [
2011-04-20 13:56:52 +00:00
document.write('< div id = "blackpage" > < img src = "/Scratch/img/loading.gif" alt = "loading..." / > < / div > ');
2011-04-20 12:29:01 +00:00
// ]]>
< / script >
< div id = "content" >
< div id = "choix" >
< div class = "return" > < a href = "#entete" > ↓ Menu ↓ < / a > < / div >
< div id = "choixlang" >
2011-04-20 13:56:52 +00:00
< a href = "/Scratch/fr/blog/2009-11-12-Git-for-n00b/c-est-parti-pour-l-aventure/" onclick = "setLanguage('fr')" > en Français< / a >
2011-04-20 12:29:01 +00:00
< / div >
2011-09-28 16:05:55 +00:00
< div class = "flush" > < / div >
2011-04-20 12:29:01 +00:00
< / div >
< div id = "titre" >
< h1 >
Git for n00b
< / h1 >
< h2 >
The Adventure Begins
< / h2 >
< / div >
< div class = "flush" > < / div >
2011-04-20 13:56:52 +00:00
< div id = "sousliens" > < ul > < li > < a href = "/Scratch/en/blog/2009-11-12-Git-for-n00b/" > introduction < span class = "nicer" > » < / span > < / a > < / li > < li > < a href = "/Scratch/en/blog/2009-11-12-Git-for-n00b/Git-pour-quoi-faire/" > Git for what? < span class = "nicer" > » < / span > < / a > < / li > < li > < a href = "/Scratch/en/blog/2009-11-12-Git-for-n00b/conf-et-install/" > Configure before Use < span class = "nicer" > » < / span > < / a > < / li > < li > < span class = "active" title = "You're here." > The Adventure Begins < span class = "nicer" > » < / span > < / span > < / li > < li > < a href = "/Scratch/en/blog/2009-11-12-Git-for-n00b/comprendre/" > Understanding < span class = "nicer" > » < / span > < / a > < / li > < li > < a href = "/Scratch/en/blog/2009-11-12-Git-for-n00b/commandes-avancees/" > Command List < span class = "nicer" > » < / span > < / a > < / li > < / ul > < / div >
2011-04-20 12:29:01 +00:00
< 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 >
2012-05-03 09:21:34 +00:00
< 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 >
2011-04-20 12:29:01 +00:00
< h4 id = "example" > example< / h4 >
< p > You start from the following file< / p >
< div style = "width: 18em; margin-left: auto; margin-right: auto" >
2012-05-02 15:43:56 +00:00
< pre > < code class = "zsh" > Zoot
< / code > < / pre >
2011-04-20 12:29:01 +00:00
< / 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 >
2012-05-02 15:43:56 +00:00
< pre > < code class = "zsh" > $ git pull
remote: Counting objects: 5, done.
2011-04-20 12:29:01 +00:00
remote: Total 3 (delta 0), reused 0 (delta 0)
2012-05-02 15:43:56 +00:00
Unpacking objects: 100% (3/3), done.
2011-04-20 12:29:01 +00:00
From /home/e640846/tmp/conflictTest
2012-05-02 15:43:56 +00:00
d3ea395..2dc7ffb master -> origin/master
2011-04-20 12:29:01 +00:00
Auto-merging foo
2012-05-02 15:43:56 +00:00
CONFLICT (content): Merge conflict in foo
Automatic merge failed; fix conflicts and then commit the result.
< / code > < / pre >
2011-04-20 12:29:01 +00:00
< / 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 >
2012-05-02 15:43:56 +00:00
< pre > < code class = "zsh" > git commit -a -m "conflict resolved"
< / code > < / pre >
2011-04-20 12:29:01 +00:00
< / div >
2012-05-03 09:21:34 +00:00
< 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 >
2011-04-20 12:29:01 +00:00
< / div >
2012-04-10 13:56:34 +00:00
< div id = "social" >
< div class = "left" > < a href = "https://twitter.com/share" class = "twitter-share-button" data-via = "yogsototh" > Tweet< / a >
< script > ! function ( d , s , id ) { var js , fjs = d . getElementsByTagName ( s ) [ 0 ] ; if ( ! d . getElementById ( id ) ) { js = d . createElement ( s ) ; js . id = id ; js . src = "//platform.twitter.com/widgets.js" ; fjs . parentNode . insertBefore ( js , fjs ) ; } } ( document , "script" , "twitter-wjs" ) ; < / script >
< / div >
< div class = "left" > < div class = "g-plusone" data-size = "medium" data-annotation = "inline" data-width = "106" > < / div >
< script type = "text/javascript" >
(function() {
var po = document.createElement('script'); po.type = 'text/javascript'; po.async = true;
po.src = 'https://apis.google.com/js/plusone.js';
var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(po, s);
})();
< / script >
< / div >
< div class = "flush" > < / div >
< / div >
2011-04-20 12:29:01 +00:00
< 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();
}
2012-04-10 13:56:34 +00:00
document.write('< div id = "clickcomment" > Comments & Share< / div > ');
2011-04-20 12:29:01 +00:00
< / script >
< div class = "flush" > < / div >
2012-04-10 13:56:34 +00:00
2011-04-20 12:29:01 +00:00
< div class = "corps" id = "comment" >
< h2 class = "first" > comments< / h2 >
< noscript >
You must enable javascript to comment.
< / noscript >
< script type = "text/javascript" >
var idcomments_acct = 'a307f0044511ff1b5cfca573fc0a52e7';
2012-01-11 20:40:22 +00:00
var idcomments_post_id = '/Scratch/en/blog/2009-11-12-Git-for-n00b/c-est-parti-pour-l-aventure/';
var idcomments_post_url = 'http://yannesposito.com/Scratch/en/blog/2009-11-12-Git-for-n00b/c-est-parti-pour-l-aventure/';
2011-04-20 12:29:01 +00:00
< / script >
< span id = "IDCommentsPostTitle" style = "display:none" > < / span >
2011-04-20 13:56:52 +00:00
< script type = 'text/javascript' src = '/Scratch/js/genericCommentWrapperV2.js' > < / script >
2011-04-20 12:29:01 +00:00
< / div >
< div id = "entete" class = "corps_spaced" >
< div id = "liens" >
2011-04-20 13:56:52 +00:00
< ul > < li > < a href = "/Scratch/en/" > Home< / a > < / li >
< li > < a href = "/Scratch/en/blog/" > Blog< / a > < / li >
< li > < a href = "/Scratch/en/softwares/" > Softwares< / a > < / li >
< li > < a href = "/Scratch/en/about/" > About< / a > < / li > < / ul >
2011-04-20 12:29:01 +00:00
< / div >
< div class = "flush" > < / div >
< hr / >
< div id = "next_before_articles" >
< div id = "previous_articles" >
previous entries
< div class = "previous_article" >
2012-01-11 20:40:22 +00:00
< a href = "/Scratch/en/blog/2009-11-12-Git-for-n00b/conf-et-install/" > < span class = "nicer" > «< / span > Git for n00b< / a >
2011-04-20 12:29:01 +00:00
< / div >
< div class = "previous_article" >
2012-01-11 20:40:22 +00:00
< a href = "/Scratch/en/blog/2009-11-12-Git-for-n00b/Git-pour-quoi-faire/" > < span class = "nicer" > «< / span > Git for n00b< / a >
2011-04-20 12:29:01 +00:00
< / div >
< / div >
< div id = "next_articles" >
next entries
< div class = "next_article" >
2012-01-11 20:40:22 +00:00
< a href = "/Scratch/en/blog/2009-11-12-Git-for-n00b/comprendre/" > Git for n00b < span class = "nicer" > »< / span > < / a >
2011-04-20 12:29:01 +00:00
< / div >
< div class = "next_article" >
2012-01-11 20:40:22 +00:00
< a href = "/Scratch/en/blog/2009-11-12-Git-for-n00b/commandes-avancees/" > Git for n00b < span class = "nicer" > »< / span > < / a >
2011-04-20 12:29:01 +00:00
< / div >
< / div >
< div class = "flush" > < / div >
< / div >
< / div >
< div id = "bottom" >
2012-04-02 21:43:39 +00:00
< div >
2012-04-10 13:56:34 +00:00
< a href = "https://twitter.com/yogsototh" > Follow @yogsototh< / a >
2012-04-02 21:43:39 +00:00
< / div >
2011-04-20 12:29:01 +00:00
< 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
Modified: 05/09/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 >
< div class = "clear" > < / div >
< / div >
< / body >
< / html >