[TOPGIT] Resolving conflicts

[Sascha Hauer <s.hauer@pengutronix.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