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

Re: StGit question

From
CMCatalin Marinas <catalin.marinas@gmail.com>
Date
Sep 12, 2008, 22:15 UTC
Message-ID
<b0943d9e0809121515v53c6d593o8211b3cbbb8dfba4@mail.gmail.com>
In-Reply-To
<48CA6367.9020300@gmail.com>
On 12/09/2008, Clark Williams <clark.williams@gmail.com> wrote:
> Most of the time it's not more than one or two patches difference, so I think that it
>  can be handled manually for now. I'll definitely keep an eye on sync and merge though...

As Karl said, we have some plans to allow collaboration between multiple StGit repositories but we didn't have much time to look at it recently. Karl's "merge" stuff looks promising though.

What "sync" does is that it allow the same set of patches between two branches to be synchronised in case modifications happened on one of these branches. In your situation, you would have to fetch the remote branch, uncommit as in Karl's method and either import or sync the remote patches with those on your local branch.

-- 
Catalin
Previous: Karl HasselströmNext: Catalin Marinas
Message 5 of 6 in “StGit question”
  1. Clark WilliamsSep 11, 2008
  2. Karl HasselströmSep 12, 2008
  3. Clark WilliamsSep 12, 2008
  4. Karl HasselströmSep 12, 2008
  5. Catalin MarinasSep 12, 2008
  6. Catalin MarinasSep 12, 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.