{"thread":{"id":"16534","subject":"[TOPGIT] Resolving conflicts","startedAt":"2008-12-01T12:18:19Z","lastAt":"2008-12-02T07:49:15Z","messageCount":3,"participants":["Sascha Hauer","Uwe Kleine-König","martin f krafft"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"96835","messageId":"20081201121819.GB13495@pengutronix.de","threadId":"16534","inReplyTo":null,"subject":"[TOPGIT] Resolving conflicts","fromName":"Sascha Hauer","fromEmail":"s.hauer@pengutronix.de","sentAt":"2008-12-01T12:18:19Z","receivedAt":"2008-12-01T12:18:19Z","isPatch":false,"sender":{"key":"s.hauer@pengutronix.de","avatar":null},"body":"Hi,\n\nI'm going my first steps with topgit and this tool seems to add the\nmissing link for my git experience.\n\nI have a little problem with conflicts resulting from different topgit\nbranches though. What I'm trying to do is this (taken from the topgit\nREADME):\n\n## Create another topic branch depending on two others non-trivially\n$ tg create t/whatever t/revlist/author-fixed t/gitweb/nifty-links\ntg: Creating t/whatever base from t/revlist/author-fixed...\ntg: Merging t/whatever base with t/gitweb/nifty-links...\nMerge failed!\ntg: Please commit merge resolution and call: tg create\ntg: It is also safe to abort this operation using `git reset --hard`\ntg: but please remember you are on the base branch now;\ntg: you will want to switch to a different branch.\n$ ..resolve..\n\nAfter resolving I exported t/whatever to a quilt series. The series does\nnot apply because it does not contain the conflict resolution. If I export\nto a git branch instead the merge is a commit of its own, resulting in a\nnon linear history.\nAny chance to fix this or am I missing something?\n\nAnother thing is that the exported branch contains an empty commit\nresulting from t/whatever (and a corresponding empty patch when exported\nas a quilt series)\n\nBest regards,\n  Sascha\n\n-- \n Pengutronix - Linux Solutions for Science and Industry\n   Handelsregister:  Amtsgericht Hildesheim, HRA 2686\n     Hannoversche Str. 2, 31134 Hildesheim, Germany\n   Phone: +49-5121-206917-0 |  Fax: +49-5121-206917-9\n"},{"id":"96854","messageId":"20081201143640.GA17818@cassiopeia.tralala","threadId":"16534","inReplyTo":"20081201121819.GB13495@pengutronix.de","subject":"Re: [TOPGIT] Resolving conflicts","fromName":"Uwe Kleine-König","fromEmail":"u.kleine-koenig@pengutronix.de","sentAt":"2008-12-01T14:36:40Z","receivedAt":"2008-12-01T14:36:40Z","isPatch":false,"sender":{"key":"u.kleine-koenig@pengutronix.de","avatar":"https://gravatar.com/avatar/354b5e3ceb2806a2f1e1e382ac29ddbdad18288654da62b61eb13583a857eee7?d=mp&s=160"},"body":"[added martin f krafft to Cc:]\n\nHi,\n\n> Another thing is that the exported branch contains an empty commit\n> resulting from t/whatever (and a corresponding empty patch when exported\n> as a quilt series)\nI fixed one half of this in with a patch sent to the ML:\n\n\thttp://article.gmane.org/gmane.comp.version-control.git/101728\n\nit didn't made it upstream yet, though.\n\nBest regards\nUwe\n"},{"id":"96932","messageId":"20081202074915.GD31660@piper.oerlikon.madduck.net","threadId":"16534","inReplyTo":"20081201143640.GA17818@cassiopeia.tralala","subject":"Re: [TOPGIT] Resolving conflicts","fromName":"martin f krafft","fromEmail":"madduck@debian.org","sentAt":"2008-12-02T07:49:15Z","receivedAt":"2008-12-02T07:49:15Z","isPatch":false,"sender":{"key":"madduck@debian.org","avatar":null},"body":"also sprach Uwe Kleine-König <u.kleine-koenig@pengutronix.de> [2008.12.01.1536 +0100]:\n> > Another thing is that the exported branch contains an empty commit\n> > resulting from t/whatever (and a corresponding empty patch when exported\n> > as a quilt series)\n> I fixed one half of this in with a patch sent to the ML:\n> \n> \thttp://article.gmane.org/gmane.comp.version-control.git/101728\n> \n> it didn't made it upstream yet, though.\n\nThis is now in HEAD. Sorry for the delay.\n\n-- \n .''`.   martin f. krafft <madduck@d.o>      Related projects:\n: :'  :  proud Debian developer               http://debiansystem.info\n`. `'`   http://people.debian.org/~madduck    http://vcs-pkg.org\n  `-  Debian - when you have better things to do than fixing systems\n \n\"i like wagner's music better than anybody's. it is so loud that one\n can talk the whole time without other people hearing what one says.\"\n                                                        -- oscar wilde\n"}]}