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.
Connect with like-minded Atlassian users at free events near you!Find a group
Connect with like-minded Atlassian users at free events near you!
Unfortunately there are no AUG chapters near you at the moment.Start an AUG
We're bringing product updates and pro tips on teamwork to ten cities around the world.Save your spot