1. TortoiseHg
  2. TortoiseHg
  3. thg
  4. Issues
Issue #2489 invalid

local and other reversed when resolving conflict during rebase

Marcin Wisnicki
created an issue

When conflict occurs during rebase (via post-pull), roles of files are reversed. Local shows incoming changes while other comes from local history.

Comments (3)

  1. Log in to comment