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@xxxxxxxxxxx
www.treskal.com/kalle
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
