Can't resolve my commit conflicts

Bugs
1

Hello,

Not sure this is a bug, more of a “this happened”.

I’ve tried to sync my project and the editor stated that I’ve got some conflicts with local changes.
When I highlighted the file/files (there were 2) and selected ‘yours’, the resolve button is greyed out.

To get around this, I copied the text from the local files into notepad and did a revert on them. Then pasted the code I wanted into the reverted files and re-synced.

All is well.

David

2

Hmm, to be honest I haven’t worked much with the internal merge tool. It’s odd that you couldn’t press the Resolve button, not sure why really. I wonder what the conflict looked like? And would an external merge tool had the same problem (probably not).

3

Yes, not a big issue for me as I managed to work around it… just flagging it up :slight_smile: