julien (Montag, 27. April 2009, 08:06): > I have added '*~' to .gitignore, to ignore back files. [...] > When I run git pull, I get: > > Updating 51fb9db..16adef3 51fb9db = your commit on Sun Apr 19 15:23:22 2009 +0200 16adef3 = my commit on Thu Apr 23 18:45:49 2009 +0200 > error: Entry '.gitignore' would be overwritten by merge. Cannot > merge. There was another commit changing .gitignore: my commit on Mon Apr 20 21:10:05 2009 +0200, and obviously our versions conflict. > and when I run git pull --rebase: > refusing to pull with rebase: your working tree is not up-to-date > > What does that mean? No idea (if your working tree was up-to-date, you wouldn't pull, would you?). I think there are three ways to handle this situation: 1) remove/revert your changes to .gitignore, update, and re-apply your changes (cowardly); 2) try to move the '*~' line within the file to a location where it doesn't produce a conflict (cowardly and ugly); 3) study carefully the git-rebase man page (taxing, but probably the best way). Good luck! ;-) Ulf
Attachment:
signature.asc
Description: This is a digitally signed message part.
_______________________________________________ Gimp-docs mailing list Gimp-docs@xxxxxxxxxxxxxxxxxxxxxx https://lists.XCF.Berkeley.EDU/mailman/listinfo/gimp-docs
