There's a silly bug I put into 1.10: If more than one item is moved within the same commit and later this commit is merged to another branch, the conflict resolver will consider every item moved in this commit as a possible move destination for any of the moved items 😞

For instance, in the only reasonable option is number 4 and the resolver shouldn't even be showing a prompt.

Fixed in and hopefully in a patch release soonish...

Sign in to participate in the conversation

Server run by the main developers of the project 🐘 It is not focused on any particular niche interest - everyone is welcome as long as you follow our code of conduct!