CG addition about Git pulling

[John Mandereau]

Hi Mark,

Could you consider adding something like the following to Git pulling
instructions?  Maybe this could be under a @knownissues section (or
"Troubleshooting") at the bottom of the the node "Update command".

%%%%%%%%%%%%%%%%%

If pull fails because of a message like

@example
error: Your local changes to 'Documentation/learning/tutorial.itely'
would be overwritten by merge.  Aborting.
@end example

or

@example
Documentation/learning/tutorial.itely: needs update
refusing to pull with rebase: your working tree is not up-to-date
@end example

it means that you have modified some files in you working tree without
committing changes, at least 'Documentation/learning/tutorial.itely' in
the example above; you can work around this by saving uncommitted
changes, pull, then reapplying previsouly saved changes:

@example
git stash
git pull -r
git stash pop
@end example

Note that @command{git stash pop} will try to apply a patch, so this may
creates a conflict; if it happens, see @ref{Resolving conflicts}.

%%%%%%%%%%%%%%%%%

Best,
John

signature.asc
Description: Ceci est une partie de message numériquement signée