I’m trying to merge changes back from a branch and I’m being prompted to resolve conflicts first. However when I hit “Resolve conflicts”, the dialog just closes and nothing happens. If I try again, I get the same screen with the same message so I’m unable to merge anything. Is this a known issue?
Enter your E-mail address. We'll send you an e-mail with instructions to reset your password.