Hi, On Tue, Aug 12, 2008 at 03:01:46PM +0200, Jan Nieuwenhuizen wrote: > I have been trying to adapt my ooo-build export to topgit > instead of plain git and ran into the (documented and > expected) merge conflicts in .top*. > > After unsuccesfully trying to script around it in my > gob git-export script, I found that this simple tg-create.sh > seems to work for me: just remove any <<<,===,>>> from > .topdeps and simply generate the new .topmgs later. > > What do you think? Is this naive way of 'auto' resolving > dependency problems doing the right thing? how exactly did you get the morge conflicts? These should never happen - I don't think we document them either? Pre-0.2 TopGit with dash as /bin/sh had a bug that caused the conflicts to still happen, but that should've been fixed (check if your .git/info/attributes does not contain '-e' at the line beginnings ;-). -- Petr "Pasky" Baudis The next generation of interesting software will be done on the Macintosh, not the IBM PC. -- Bill Gates -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
