Re: [Gimp-docs] My contribution to spanish gimp documentation

["Ulf-D. Ehlert" <ude88 web de>]

On Thu, Sep 13, 2012 at 02:45:37PM +0200, Guiu Rocafort wrote:
> Hi, after sending the patch I'm not able to do "git pull" anymore in the
> gimp-help-2 repository. The error it throws is the next:
> 
> "guiu@guiu-N50Vc:~/src/gimp-help-2$ git pull
> Updating 2817d87..0f50720
> error: Your local changes to the following files would be overwritten by
> merge:
>         po/es/dialogs.po
>         po/es/filters/render.po
>         po/es/introduction.po
>         po/es/toolbox/transform.po
> Please, commit your changes or stash them before you can merge.
> Aborting "
> 
> I've tried to stag the files using "git add <file>" for every file it
> report problems, but I had no success with that.
> I'm sorry for annoying you with my newbie git problems.

You can try

	1) git add po/es
	   git commit -m "Your commit message"
	   git pull --rebase
	   git format-patch -1  # not sure about the "-1"
or
	2) git diff > your_saved_changes.patch  # paranoia...
	   git stash
	   git pull
	   git stash apply  # don't know: can this fail?
	   git stash drop   # only if "apply" succeeded
or
	3) git diff > your_saved_changes.patch
	   git checkout po/es
	   git pull
	   patch -p1 < your_saved_changes.patch

If some command failes or something goes wrong, git prints an error
message and usually a useful tip.

"git help <command>" prints detailed infos about the specified git
command ("man git-command" should do the same).

But note that I'm a git newbie too...

HTH,
Ulf


-- 
Mißtraut denen, die da sagen, dass Gott auf ihrer Seite steht.
Sie sind nur so nah ihrem Gott, weil sie so fern dem Menschen sind.
		-- Michael Schmidt-Salomon