From: Karl Hasselström Date: Fri, 29 Feb 2008 07:58:21 GMT Subject: Re: stgit - continue rebase after merge conflict? Message-ID: <20080229075821.GA14773@diana.vm.bytemark.co.uk> In-Reply-To: On 2008-02-28 21:50:04 +0000, Catalin Marinas wrote: > It says that it's a merge conflict but isn't more precise than that. > You can run 'stg status' to check the conflicts. > > The reason is that you are probably using the development branch of > StGIT and we (actually Karl) are refactoring the GIT objects > handling. The 'goto' command (but not 'push') was moved to the new > infrastructure but missed some of the UI stuff. They'll be added > back. Yeah, I'd forgotten all about that. I rarely get conflicts when running "stg goto". -- Karl Hasselström, kha@treskal.com www.treskal.com/kalle