git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: stgit - continue rebase after merge conflict?

From
Karl Hasselström <kha@treskal.com>
Date
Feb 29, 2008, 07:58 UTC
Message-ID
<20080229075821.GA14773@diana.vm.bytemark.co.uk>
In-Reply-To
<b0943d9e0802281350r3945d3f0qd0dd8ee61679e82d@mail.gmail.com>
On 2008-02-28 21:50:04 +0000, Catalin Marinas wrote:
Show 8 quoted lines
> 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
Previous: Catalin Marinas
Message 7 of 7 in “stgit - continue rebase after merge conflict?”
  1. Alex ChiangFeb 26, 2008
  2. Catalin MarinasFeb 26, 2008
  3. Alex ChiangFeb 26, 2008
  4. Karl HasselströmFeb 27, 2008
  5. Alex ChiangFeb 28, 2008
  6. Catalin MarinasFeb 28, 2008
  7. Karl HasselströmFeb 29, 2008

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.