Re: [gthumb-list] a second patch

["Dr. Michael J. Chudobiak" <mjc avtechpulse com>]

> error: Entry 'data/glade/gthumb_edit.glade' not uptodate. Cannot merge.
> ==============================
>
> data/glade/gthumb_edit.glade es the file I made the patch with.
>
> What  should I do?

I'm not sure - I'm still learning git too.

However, you could try:

1. git stash
2. git pull
3. git stash apply  (or edit your file again manually)


"git stash" removes your local uncommitted changes, and "git stash 
apply" puts them back in.

- Mike