marc gonzalez-carnicer wrote: > me too i recently found out that you need to use --bidirectional also > when merging back. IMO this is not properly documented. It should no longer be required to use that flag at all. Are you using the latest trunk version? If so, this is a bug. Cheers, Raman Gupta