[Continue a pending merge (link)]

Thanks, next time I will definitely contact you with this e-mail, forum is too slow

For now I "fixed" it by manually backing up my files and reverting all changes. Sadly, I couldn't pull the remote branch first, as the merge was required and the merge couldn't be completed because of reasons (picture from my previous post).

Best,

Chopin

[Continue a pending merge (link)]

I wanted to push my changes. I couldn't do it, because there were newer changesets. I wanted to update, but the merge was required. I wanted to merge, but the merge couldn't be completed due to what it seems are "info" level warnings. It's absurd. I will have to manually backup my changed files and revert both merge and my changes.

Please tell me I can do it "correctly", as such deadlock should not happen in any VCS.

 

Merge that cannot be completed (hitting apply does nothing):

Best,

Chopin

 

[Continue a pending merge (link)]

to delete