On 12/09/2008, Clark Williams <clark.williams@xxxxxxxxx> 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 -- 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
