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

Continued work on sr/vcs-helper and sr/gfi-options

From
Sverre Rabbelier <srabbelier@gmail.com>
Date
Dec 6, 2009, 00:53 UTC
Message-ID
<fabb9a1e0912051653s77ba25e1g9ff1e21219cd06c9@mail.gmail.com>
Heya,

I'm planning to start finishing up git-remote-hg this week, and for that I need both sr/vcs-helper (in next) and sr/gfi-options (in pu). How can I best go about working on these? I _think_ what I want is to merge sr/vcs-helper and sr/gfi-options, into either master or next (with a three-way merge), but I'm not sure? Also, when I try to rebase sr/vcs-helper onto master I get conflicts yet again, since these were already resolved in next, what is the best way for me to proceed in such a way that it is convenient for you (Junio) and the list, if possible, without having to untangle those merge conflicts.

Thanks!
-- 
Cheers,

Sverre Rabbelier
Next: Miklos Vajna
Message 1 of 6 in “Continued work on sr/vcs-helper and sr/gfi-options”
  1. Sverre RabbelierDec 6, 2009
  2. Miklos VajnaDec 6, 2009
  3. Junio C HamanoDec 6, 2009
  4. Sverre RabbelierDec 6, 2009
  5. Junio C HamanoDec 6, 2009
  6. Sverre RabbelierDec 7, 2009

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.