I am currently rebasing a commit i made a month or 2 ago. On the merge it shows all the conflicts in the working copy but when i select a file to fix the conflict nothing shows up on the right. The file is listed as Unmodified. Yet i can see changes to the files in there respective history and they are listed as a conflict in the working copy. This dosnt happen for all files however, some show the changes and i can fix them fine. As a result of it not showing the changes my external merge tool wont open. I am using Beyond Compare and it worked great on other merges. I have also tried cherry picking form the original commit and it had the same results.
You must be a registered user to add a comment. If you've already registered, sign in. Otherwise, register and sign in.