[StGit PATCH 0/6] Use git conflict handling on push · David Kågedal <hidden> · 2016-06-15
[StGit PATCH 1/6] Split git.merge into two functions · David Kågedal <hidden> · 2016-06-15
[StGit PATCH 2/6] Don't try to merge files that merge-recursive already merged · David Kågedal <hidden> · 2016-06-15
[StGit PATCH 3/6] Don't touch state after conflict in push · David Kågedal <hidden> · 2016-06-15
[StGit PATCH 4/6] Added a test case to check what happens when push finds a conflict · David Kågedal <hidden> · 2016-06-15
[StGit PATCH 5/6] Simplify merge_recursive · David Kågedal <hidden> · 2016-06-15
[StGit PATCH 6/6] Use the output from merge-recursive to list conflicts · David Kågedal <hidden> · 2016-06-15
Re: [StGit PATCH 2/6] Don't try to merge files that merge-recursive already merged · Karl Hasselström <hidden> · 2016-06-15
Re: [StGit PATCH 0/6] Use git conflict handling on push · Karl Hasselström <hidden> · 2016-06-15
Re: [StGit PATCH 0/6] Use git conflict handling on push · Catalin Marinas <hidden> · 2016-06-15

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

From: Karl Hasselström <hidden>
Date: 2016-06-15 22:43:30

On 2007-08-20 10:11:57 +0200, David Kågedal wrote:

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

Great initiative! This will make stg conceptually simpler to anyone
who already knows git (which ought to be a large fraction of the user
base), _and_ get rid of a lot of complicated code.

-- 
Karl Hasselström, kha@treskal.com
      www.treskal.com/kalle

`h`	back out one level
`j`	next message in thread
`k`	previous message in thread
`l`	drill in
`Esc`	close help / fold thread tree
`?`	toggle this help