From: Nico -telmich- Schottelius <nico-linux-git@schottelius.org>
Date: Fri, 30 Jan 2009 08:42:53 GMT
Subject: Re: question re dcommit problem
Message-ID: <20090130084253.GA30046@denkbrett.schottelius.org>
In-Reply-To: <49824650.2070209@epstudiossoftware.com>

David Mann [Thu, Jan 29, 2009 at 07:14:08PM -0500]:
> I created a git repository from my svn repository, later uploaded it to
> GitHub, and after some branching and merging, can no longer dcommit back
> to the svn repository. [...]

Iirc git svn does not support merges. You've to use git rebase or
update through the svn server.

Sincerly,

Nico

-- 
Think about Free and Open Source Software (FOSS).
http://nico.schottelius.org/documentations/foss/the-term-foss/

PGP: BFE4 C736 ABE5 406F 8F42  F7CF B8BE F92A 9885 188C