Karl Hasselström <kha@xxxxxxxxxxx> writes: > On 2007-11-05 10:57:17 +0100, Matthieu Moy wrote: > >> Karl Hasselström <kha@xxxxxxxxxxx> writes: >> >> > -directly). For standard SCM operations, either use plain GIT commands >> > -or the Cogito tool but it is not recommended to mix them with the >> > -StGIT commands. >> > +directly). For standard SCM operations, use plain GIT commands. >> >> Doesn't the "but it is not recommended to mix them with the StGIT >> commands." part still hold? > > I'm not sure it ever held. Except possibly during merge resolution, > but that mismatch is going away with the patch series by David Kågedal > that's sitting in kha/experimental (which changes StGit to use exactly > the same conflict representation as git). Don't forget your new assimilate implementation. -- David Kågedal - 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
