# [TOPGIT] Resolving conflicts 3 messages from 2008-12-01 to 2008-12-02. Participants: Sascha Hauer, Uwe Kleine-König, martin f krafft. Thread: https://gitlist.dev/t/16534 ## Sascha Hauer, 2008-12-01 12:18 Subject: [TOPGIT] Resolving conflicts Message-ID: <20081201121819.GB13495@pengutronix.de> URL: https://gitlist.dev/e/20081201121819.GB13495%40pengutronix.de ``` Hi, I'm going my first steps with topgit and this tool seems to add the missing link for my git experience. I have a little problem with conflicts resulting from different topgit branches though. What I'm trying to do is this (taken from the topgit README): ## Create another topic branch depending on two others non-trivially $ tg create t/whatever t/revlist/author-fixed t/gitweb/nifty-links tg: Creating t/whatever base from t/revlist/author-fixed... tg: Merging t/whatever base with t/gitweb/nifty-links... Merge failed! tg: Please commit merge resolution and call: tg create tg: It is also safe to abort this operation using `git reset --hard` tg: but please remember you are on the base branch now; tg: you will want to switch to a different branch. $ ..resolve.. After resolving I exported t/whatever to a quilt series. The series does not apply because it does not contain the conflict resolution. If I export to a git branch instead the merge is a commit of its own, resulting in a non linear history. Any chance to fix this or am I missing something? 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) Best regards, Sascha -- Pengutronix - Linux Solutions for Science and Industry Handelsregister: Amtsgericht Hildesheim, HRA 2686 Hannoversche Str. 2, 31134 Hildesheim, Germany Phone: +49-5121-206917-0 | Fax: +49-5121-206917-9 ``` ## Uwe Kleine-König, 2008-12-01 14:36 Subject: Re: [TOPGIT] Resolving conflicts Message-ID: <20081201143640.GA17818@cassiopeia.tralala> URL: https://gitlist.dev/e/20081201143640.GA17818%40cassiopeia.tralala In-Reply-To: <20081201121819.GB13495@pengutronix.de> ``` [added martin f krafft to Cc:] Hi, > 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. Best regards Uwe ``` ## martin f krafft, 2008-12-02 07:49 Subject: Re: [TOPGIT] Resolving conflicts Message-ID: <20081202074915.GD31660@piper.oerlikon.madduck.net> URL: https://gitlist.dev/e/20081202074915.GD31660%40piper.oerlikon.madduck.net In-Reply-To: <20081201143640.GA17818@cassiopeia.tralala> ``` also sprach Uwe Kleine-König [2008.12.01.1536 +0100]: > > 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 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 ```