<!-- header_tag -->
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html401/loose.dtd">
<html>
<!-- Copyright C 1999-2008 by the authors
Permission is granted to copy, distribute and/or modify this document
under the terms of the GNU Free Documentation License, Version 1.1
or any later version published by the Free Software Foundation;
with no Invariant Sections.
A copy of the license is included in the section entitled "GNU
Free Documentation License".
-->
<!-- Created on December 15, 2009 by texi2html 1.82
texi2html was written by:
Lionel Cons <Lionel.Cons@cern.ch> (original author)
Karl Berry <karl@freefriends.org>
Olaf Bachmann <obachman@mathematik.uni-kl.de>
and many others.
Maintained by: Many creative people.
Send bugs and suggestions to <texi2html-bug@nongnu.org>
-->
<head>
<title>GNU LilyPond Contributor's Guide: 1.2 Updating the source code</title>
<meta name="description" content="GNU LilyPond Contributor's Guide: 1.2 Updating the source code">
<meta name="keywords" content="GNU LilyPond Contributor's Guide: 1.2 Updating the source code">
<meta name="resource-type" content="document">
<meta name="distribution" content="global">
<meta name="Generator" content="texi2html 1.82">
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<link href="index.fr.html#index" rel="start" title="GNU LilyPond — Contributor's Guide">
<link href="index_toc.fr.html#SEC_Contents" rel="contents" title="Table of Contents">
<link href="index_abt.fr.html#SEC_About" rel="help" title="About This Document">
<link href="Starting-with-git.fr.html#Starting-with-git" rel="up" title="1. Starting with git">
<link href="Making-a-release.fr.html#Making-a-release" rel="next" title="8.4 Making a release">
<link href="Getting-the-source-code.fr.html#Getting-the-source-code" rel="previous" title="1.1 Getting the source code">
<link rel="stylesheet" type="text/css" title="Patrick McCarty's design" href="lilypond-mccarty.css">
<link rel="alternate stylesheet" type="text/css" href="lilypond.css" title="Andrew Hawryluk's design">
<link rel="alternate stylesheet" type="text/css" href="lilypond-blue.css" title="Kurt Kroon's blue design">
<!--[if lte IE 7]>
<link href="lilypond-ie-fixes.css" rel="stylesheet" type="text/css">
<![endif]-->
</head>
<body lang="en" bgcolor="#FFFFFF" text="#000000" link="#0000FF" vlink="#800080" alink="#FF0000">
<div id="main">
<a name="Updating-the-source-code"></a>
<table class="nav_table">
<tr><td valign="middle" align="left" colspan="1">[<a href="Starting-with-git.fr.html#Starting-with-git" title="Beginning of this chapter or previous chapter"> << Starting with git </a>]</td><td valign="middle" align="center" colspan="3">[<a href="index.fr.html#index" title="Cover (top) of document" rel="start">Top</a>][<a href="index_toc.fr.html#SEC_Contents" title="Table of contents" rel="contents">Contents</a>][Index][<a href="index_abt.fr.html#SEC_About" title="About (help)" rel="help"> ? </a>]</td><td valign="middle" align="right" colspan="1">[<a href="Compiling-LilyPond.fr.html#Compiling-LilyPond" title="Next chapter"> Compiling LilyPond >> </a>]</td></tr><tr><td valign="middle" align="left" colspan="2">[<a href="Getting-the-source-code.fr.html#Git-user-configuration" title="Previous section in reading order" accesskey="p" rel="previous"> < Git user configuration </a>]</td><td valign="middle" align="center" colspan="1">[<a href="Starting-with-git.fr.html#Starting-with-git" title="Up section" accesskey="u" rel="up"> Up : Starting with git </a>]</td><td valign="middle" align="right" colspan="2">[<a href="#Importance-of-updating" title="Next section in reading order" accesskey="n" rel="next"> Importance of updating > </a>]</td></tr></table>
<a name="Updating-the-source-code"></a>
<h2 class="section">1.2 Updating the source code</h2>
<table class="menu" border="0" cellspacing="0">
<tr><td align="left" valign="top"><a href="#Importance-of-updating" accesskey="1">1.2.1 Importance of updating</a></td><td> </td><td align="left" valign="top">
</td></tr>
<tr><td align="left" valign="top"><a href="#Update-command" accesskey="2">1.2.2 Updating command</a></td><td> </td><td align="left" valign="top">
</td></tr>
<tr><td align="left" valign="top"><a href="#Resolving-conflicts" accesskey="3">1.2.3 Resolving conflicts</a></td><td> </td><td align="left" valign="top">
</td></tr>
</table>
<hr size="6">
<a name="Importance-of-updating"></a>
<table class="nav_table">
<tr><td valign="middle" align="left" colspan="1">[<a href="Starting-with-git.fr.html#Starting-with-git" title="Beginning of this chapter or previous chapter"> << Starting with git </a>]</td><td valign="middle" align="center" colspan="3">[<a href="index.fr.html#index" title="Cover (top) of document" rel="start">Top</a>][<a href="index_toc.fr.html#SEC_Contents" title="Table of contents" rel="contents">Contents</a>][Index][<a href="index_abt.fr.html#SEC_About" title="About (help)" rel="help"> ? </a>]</td><td valign="middle" align="right" colspan="1">[<a href="Compiling-LilyPond.fr.html#Compiling-LilyPond" title="Next chapter"> Compiling LilyPond >> </a>]</td></tr><tr><td valign="middle" align="left" colspan="2">[<a href="#Updating-the-source-code" title="Previous section in reading order" accesskey="p" rel="previous"> < Updating the source code </a>]</td><td valign="middle" align="center" colspan="1">[<a href="#Updating-the-source-code" title="Up section" accesskey="u" rel="up"> Up : Updating the source code </a>]</td><td valign="middle" align="right" colspan="2">[<a href="#Update-command" title="Next section in reading order" accesskey="n" rel="next"> Update command > </a>]</td></tr></table>
<a name="Importance-of-updating"></a>
<h3 class="subsection">1.2.1 Importance of updating</h3>
<p>In a large project like LilyPond, contributors sometimes edit the same
file at the same time. As long as everybody updates their version of
the file with the most recent changes (<em>pulling</em>), there are
generally no problems with this multiple-person editing. However,
boring problems can arise if you do not pull before attempting commit,
e.g. you may encounter a conflict; in this case, see <a href="#Resolving-conflicts">Resolving conflicts</a>.
</p>
<hr size="6">
<a name="Update-command"></a>
<table class="nav_table">
<tr><td valign="middle" align="left" colspan="1">[<a href="Starting-with-git.fr.html#Starting-with-git" title="Beginning of this chapter or previous chapter"> << Starting with git </a>]</td><td valign="middle" align="center" colspan="3">[<a href="index.fr.html#index" title="Cover (top) of document" rel="start">Top</a>][<a href="index_toc.fr.html#SEC_Contents" title="Table of contents" rel="contents">Contents</a>][Index][<a href="index_abt.fr.html#SEC_About" title="About (help)" rel="help"> ? </a>]</td><td valign="middle" align="right" colspan="1">[<a href="Compiling-LilyPond.fr.html#Compiling-LilyPond" title="Next chapter"> Compiling LilyPond >> </a>]</td></tr><tr><td valign="middle" align="left" colspan="2">[<a href="#Importance-of-updating" title="Previous section in reading order" accesskey="p" rel="previous"> < Importance of updating </a>]</td><td valign="middle" align="center" colspan="1">[<a href="#Updating-the-source-code" title="Up section" accesskey="u" rel="up"> Up : Updating the source code </a>]</td><td valign="middle" align="right" colspan="2">[<a href="#Resolving-conflicts" title="Next section in reading order" accesskey="n" rel="next"> Resolving conflicts > </a>]</td></tr></table>
<a name="Update-command"></a>
<h3 class="subsection">1.2.2 Updating command</h3>
<p>Whenever you are asked to pull, it means you should update your
local copy of the repository with the changes made by others on
the remote <code>git.sv.gnu.org</code> repository:
</p>
<blockquote><pre class="example">git pull -r
</pre></blockquote>
<hr size="6">
<a name="Resolving-conflicts"></a>
<table class="nav_table">
<tr><td valign="middle" align="left" colspan="1">[<a href="Starting-with-git.fr.html#Starting-with-git" title="Beginning of this chapter or previous chapter"> << Starting with git </a>]</td><td valign="middle" align="center" colspan="3">[<a href="index.fr.html#index" title="Cover (top) of document" rel="start">Top</a>][<a href="index_toc.fr.html#SEC_Contents" title="Table of contents" rel="contents">Contents</a>][Index][<a href="index_abt.fr.html#SEC_About" title="About (help)" rel="help"> ? </a>]</td><td valign="middle" align="right" colspan="1">[<a href="Compiling-LilyPond.fr.html#Compiling-LilyPond" title="Next chapter"> Compiling LilyPond >> </a>]</td></tr><tr><td valign="middle" align="left" colspan="2">[<a href="#Update-command" title="Previous section in reading order" accesskey="p" rel="previous"> < Update command </a>]</td><td valign="middle" align="center" colspan="1">[<a href="#Updating-the-source-code" title="Up section" accesskey="u" rel="up"> Up : Updating the source code </a>]</td><td valign="middle" align="right" colspan="2">[<a href="Sharing-your-changes.fr.html#Sharing-your-changes" title="Next section in reading order" accesskey="n" rel="next"> Sharing your changes > </a>]</td></tr></table>
<a name="Resolving-conflicts"></a>
<h3 class="subsection">1.2.3 Resolving conflicts</h3>
<p>Occasionally an update may result in conflicts – this happens
when you and somebody else have modified the same part of the same
file and git cannot figure out how to merge the two versions
together. When this happens, you must manually merge the two
versions.
</p>
<p>If you need some documentation to understand and resolve conflicts,
see paragraphs <em>How conflicts are presented</em> and <em>How to
resolve conflicts</em> in <code>git merge</code> man page.
</p>
<hr size="6">
<table class="nav_table">
<tr><td valign="middle" align="left" colspan="1">[<a href="Starting-with-git.fr.html#Starting-with-git" title="Beginning of this chapter or previous chapter"> << Starting with git </a>]</td><td valign="middle" align="center" colspan="3">[<a href="index.fr.html#index" title="Cover (top) of document" rel="start">Top</a>][<a href="index_toc.fr.html#SEC_Contents" title="Table of contents" rel="contents">Contents</a>][Index][<a href="index_abt.fr.html#SEC_About" title="About (help)" rel="help"> ? </a>]</td><td valign="middle" align="right" colspan="1">[<a href="Compiling-LilyPond.fr.html#Compiling-LilyPond" title="Next chapter"> Compiling LilyPond >> </a>]</td></tr><tr><td valign="middle" align="left" colspan="2">[<a href="#Update-command" title="Previous section in reading order" accesskey="p" rel="previous"> < Update command </a>]</td><td valign="middle" align="center" colspan="1">[<a href="#Updating-the-source-code" title="Up section" accesskey="u" rel="up"> Up : Updating the source code </a>]</td><td valign="middle" align="right" colspan="2">[<a href="Sharing-your-changes.fr.html#Sharing-your-changes" title="Next section in reading order" accesskey="n" rel="next"> Sharing your changes > </a>]</td></tr></table>
<!-- footer_tag -->
<div class="footer">
<p class="footer_version">
This page is for LilyPond-2.12.3 (stable-branch).
</p>
<p class="footer_report">
Your <a href="http://lilypond.org/web/devel/participating/documentation-adding">suggestions for the documentation</a> are welcome, please report errors to our <a href="http://post.gmane.org/post.php?group=gmane.comp.gnu.lilypond.bugs">bug list</a>.
</p>
</div>
<!-- FOOTER -->
<!-- end div#main here -->
</div>
<div id="tocframe">
<p class="toc_uplink"><a href="../index.fr.html"
title="Documentation Index"><< Back to Documentation Index</a></p>
<h4 class="toc_header"> <a href="index.fr.html#index" title="Start of the manual">Contributor’s Guide</a></h4>
<div class="contents">
<ul class="toc">
<li class="toc_current"><a name="toc-Starting-with-git-1" href="Starting-with-git.fr.html#Starting-with-git">1. Starting with git</a>
<ul class="toc">
<li><a name="toc-Getting-the-source-code-1" href="Getting-the-source-code.fr.html#Getting-the-source-code">1.1 Getting the source code</a> </li>
<li class="toc_current"><a name="toc-Updating-the-source-code-1" href="Updating-the-source-code.fr.html#Updating-the-source-code">1.2 Updating the source code</a>
<ul class="toc">
<li><a name="toc-Importance-of-updating-1" href="Updating-the-source-code.fr.html#Importance-of-updating">1.2.1 Importance of updating</a> </li>
<li><a name="toc-Updating-command" href="Updating-the-source-code.fr.html#Update-command">1.2.2 Updating command</a> </li>
<li><a name="toc-Resolving-conflicts-1" href="Updating-the-source-code.fr.html#Resolving-conflicts">1.2.3 Resolving conflicts</a> </li>
</ul>
</li>
<li><a name="toc-Sharing-your-changes-1" href="Sharing-your-changes.fr.html#Sharing-your-changes">1.3 Sharing your changes</a> </li>
<li><a name="toc-Advanced-git-stuff-1" href="Advanced-git-stuff.fr.html#Advanced-git-stuff">1.4 Advanced git stuff</a> </li>
<li><a name="toc-Git-on-Windows-1" href="Git-on-Windows.fr.html#Git-on-Windows">1.5 Git on Windows</a> </li>
</ul>
</li>
<li><a name="toc-Compiling-LilyPond-1" href="Compiling-LilyPond.fr.html#Compiling-LilyPond">2. Compiling LilyPond</a>
<ul class="toc">
<li><a name="toc-Compiling-from-source-1" href="Compiling-from-source.fr.html#Compiling-from-source">2.1 Compiling from source</a> </li>
<li><a name="toc-Concurrent-Stable-and-Development-Versions-1" href="Concurrent-Stable-and-Development-Versions.fr.html#Concurrent-Stable-and-Development-Versions">2.2 Concurrent Stable and Development Versions</a> </li>
</ul>
</li>
<li><a name="toc-Documentation-work-1" href="Documentation-work.fr.html#Documentation-work">3. Documentation work</a>
<ul class="toc">
<li><a name="toc-Introduction-to-documentation-work-1" href="Introduction-to-documentation-work.fr.html#Introduction-to-documentation-work">3.1 Introduction to documentation work</a> </li>
<li><a name="toc-Documentation-suggestions-1" href="Documentation-suggestions.fr.html#Documentation-suggestions">3.2 Documentation suggestions</a> </li>
<li><a name="toc-Texinfo-introduction-and-usage-policy-1" href="Texinfo-introduction-and-usage-policy.fr.html#Texinfo-introduction-and-usage-policy">3.3 Texinfo introduction and usage policy</a> </li>
<li><a name="toc-Documentation-policy-1" href="Documentation-policy.fr.html#Documentation-policy">3.4 Documentation policy</a> </li>
<li><a name="toc-Tips-for-writing-docs-1" href="Tips-for-writing-docs.fr.html#Tips-for-writing-docs">3.5 Tips for writing docs</a> </li>
<li><a name="toc-Updating-doc-with-convert_002dly" href="Updating-docs-with-convert_002dly.fr.html#Updating-docs-with-convert_002dly">3.6 Updating doc with <code>convert-ly</code></a> </li>
<li><a name="toc-Translating-the-documentation-1" href="Translating-the-documentation.fr.html#Translating-the-documentation">3.7 Translating the documentation</a> </li>
</ul>
</li>
<li><a name="toc-Website-work-1" href="Website-work.fr.html#Website-work">4. Website work</a>
<ul class="toc">
<li><a name="toc-Introduction-to-website-work-1" href="Introduction-to-website-work.fr.html#Introduction-to-website-work">4.1 Introduction to website work</a> </li>
<li><a name="toc-Translating-the-website-1" href="Translating-the-website.fr.html#Translating-the-website">4.2 Translating the website</a> </li>
</ul>
</li>
<li><a name="toc-LSR-work-1" href="LSR-work.fr.html#LSR-work">5. LSR work</a>
<ul class="toc">
<li><a name="toc-Introduction-to-LSR-1" href="Introduction-to-LSR.fr.html#Introduction-to-LSR">5.1 Introduction to LSR</a> </li>
<li><a name="toc-Adding-and-editing-snippets-1" href="Adding-and-editing-snippets.fr.html#Adding-and-editing-snippets">5.2 Adding and editing snippets</a> </li>
<li><a name="toc-Approving-snippets-1" href="Approving-snippets.fr.html#Approving-snippets">5.3 Approving snippets</a> </li>
<li><a name="toc-LSR-to-Git-1" href="LSR-to-Git.fr.html#LSR-to-Git">5.4 LSR to Git</a> </li>
<li><a name="toc-Fixing-snippets-in-LilyPond-sources-1" href="Fixing-snippets-in-LilyPond-sources.fr.html#Fixing-snippets-in-LilyPond-sources">5.5 Fixing snippets in LilyPond sources</a> </li>
<li><a name="toc-Updating-LSR-to-a-new-version-1" href="Updating-LSR-to-a-new-version.fr.html#Updating-LSR-to-a-new-version">5.6 Updating LSR to a new version</a> </li>
</ul>
</li>
<li><a name="toc-Issues-1" href="Issues.fr.html#Issues">6. Issues</a>
<ul class="toc">
<li><a name="toc-Introduction-to-issues-1" href="Introduction-to-issues.fr.html#Introduction-to-issues">6.1 Introduction to issues</a> </li>
<li><a name="toc-Issue-classification-1" href="Issue-classification.fr.html#Issue-classification">6.2 Issue classification</a> </li>
<li><a name="toc-Adding-issues-to-the-tracker-1" href="Adding-issues-to-the-tracker.fr.html#Adding-issues-to-the-tracker">6.3 Adding issues to the tracker</a> </li>
</ul>
</li>
<li><a name="toc-Programming-work-1" href="Programming-work.fr.html#Programming-work">7. Programming work</a>
<ul class="toc">
<li><a name="toc-Overview-of-LilyPond-architecture-1" href="Overview-of-LilyPond-architecture.fr.html#Overview-of-LilyPond-architecture">7.1 Overview of LilyPond architecture</a> </li>
<li><a name="toc-LilyPond-programming-languages-1" href="LilyPond-programming-languages.fr.html#LilyPond-programming-languages">7.2 LilyPond programming languages</a> </li>
<li><a name="toc-Programming-without-compiling-1" href="Programming-without-compiling.fr.html#Programming-without-compiling">7.3 Programming without compiling</a> </li>
<li><a name="toc-Finding-functions-1" href="Finding-functions.fr.html#Finding-functions">7.4 Finding functions</a> </li>
<li><a name="toc-Code-style-1" href="Code-style.fr.html#Code-style">7.5 Code style</a> </li>
<li><a name="toc-Debugging-LilyPond-1" href="Debugging-LilyPond.fr.html#Debugging-LilyPond">7.6 Debugging LilyPond</a> </li>
</ul>
</li>
<li><a name="toc-Release-work-1" href="Release-work.fr.html#Release-work">8. Release work</a>
<ul class="toc">
<li><a name="toc-Development-phases-1" href="Development-phases.fr.html#Development-phases">8.1 Development phases</a> </li>
<li><a name="toc-Minor-release-checklist-1" href="Minor-release-checklist.fr.html#Minor-release-checklist">8.2 Minor release checklist</a> </li>
<li><a name="toc-Major-release-checklist-1" href="Major-release-checklist.fr.html#Major-release-checklist">8.3 Major release checklist</a> </li>
<li><a name="toc-Making-a-release-1" href="Making-a-release.fr.html#Making-a-release">8.4 Making a release</a> </li>
</ul>
</li>
</ul>
</div>
</div>
</body>
</html>
