From: Petr Baudis Date: Thu, 22 Sep 2005 19:10:58 GMT Subject: Re: Please undo "Use git-merge instead of git-resolve in Message-ID: <20050922191058.GM21019@pasky.or.cz> In-Reply-To: Dear diary, on Thu, Sep 22, 2005 at 08:32:45PM CEST, I got a letter where Jon Loeliger told me that... > Which points out one of the other points of frustration > that I feel should be addressed eventually: A whole section > about "What To Do When It Goes Wonky" needs to be written. > > OK, so it didn't merge? Now what? What got left where? > How do I recover? What bits are in my tree, and what bits > are in the Index, and what bits are in the Object store now? > > OK, so it didn't download it left you "refs/heads/rigin.remote". > What should I do with it now? And later, should I re-execute > the same "git fetch" command and hope it recovers and patches > the pieces together? Should I do a round of house cleaning > before attempting to re-run some (the same?) command? FWIW, with Cogito, interrupted or failed fetch can be safely rerun, no extra recovery procedure is required. It *seems* that this holds for git-fetch as well. -- Petr "Pasky" Baudis Stuff: http://pasky.or.cz/ VI has two modes: the one in which it beeps and the one in which it doesn't.