Re: [StGit PATCH 0/6] Use git conflict handling on push

From: Catalin Marinas <catalin.marinas@gmail.com>
Date: Aug 23, 2007, 14:54 UTC
Message-ID: <b0943d9e0708230754r533f7749l63b5e2ba9a5dcfe8@mail.gmail.com>
In-Reply-To: <11875975232619-git-send-email-davidk@lysator.liu.se>

On 20/08/07, David Kågedal <davidk@lysator.liu.se> wrote:

> This series of patches updates "stg push" to leave conflicts in the
> index, in the normal git fashion.

Thanks for this series. I'll give it a try (importing it from the kha branch as it is easier) and check other issues it might break.

> This means that conflict handling and resolution are handled by git
> and not stg, which should make it possible to simplify stg quite a
> bit.  For instance, the 'conflicts' file should go away.

Yes, indeed.

Show 5 quoted lines

> Unfortunately, this patch series isn't complete, since it doesn't
> remove all uses of the stg merge code.  The remaining client of that
> code is the "sync" command, which I have never used, and haven't
> studied very much.  But if that command is changed somehow, then most
> of the code in gitmergeonefile.py will go simply away.

I still like to keep the interactive merging from that file.

> https://gna.org/task/?5140

BTW, would you like to be added as a project member at gna.org/projects/stgit?

Regards.

-- 
Catalin