Re: [TOPGIT] Resolving conflicts

From: martin f krafft <madduck@debian.org>
Date: Dec 2, 2008, 07:49 UTC
Message-ID: <20081202074915.GD31660@piper.oerlikon.madduck.net>
In-Reply-To: <20081201143640.GA17818@cassiopeia.tralala>

also sprach Uwe Kleine-König <u.kleine-koenig@pengutronix.de> [2008.12.01.1536 +0100]:

Show 8 quoted lines

> > Another thing is that the exported branch contains an empty commit
> > resulting from t/whatever (and a corresponding empty patch when exported
> > as a quilt series)
> I fixed one half of this in with a patch sent to the ML:
> 
> 	http://article.gmane.org/gmane.comp.version-control.git/101728
> 
> it didn't made it upstream yet, though.

This is now in HEAD. Sorry for the delay.

-- 
 .''`.   martin f. krafft <madduck@d.o>      Related projects:
: :'  :  proud Debian developer               http://debiansystem.info
`. `'`   http://people.debian.org/~madduck    http://vcs-pkg.org
  `-  Debian - when you have better things to do than fixing systems
 
"i like wagner's music better than anybody's. it is so loud that one
 can talk the whole time without other people hearing what one says."
                                                        -- oscar wilde