From: Karl Hasselström Date: Wed, 22 Aug 2007 09:17:57 GMT Subject: Re: [StGit PATCH 0/6] Use git conflict handling on push Message-ID: <20070822091757.GA30748@diana.vm.bytemark.co.uk> In-Reply-To: <11875975232619-git-send-email-davidk@lysator.liu.se> 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