Merge fails

[Xavier]

Hello

I've done a first successful merge on a brand new branch. But now, everytime I do a merge it seems to fail:
affected files are checked out
there are having conflicts though some of them have not been modified since the branch
when I make a show diff, there is no difference

I've tried with both the automatic merge checked and unchecked but it fails.

Xavier

[Beth]

I would need to see exactly what conflicts you are having. Are they just a case of where you get a Needs Merge status? Or are they highlighted in orange during the Merge Branches process? I need more details.

[Xavier]

The main problem is that the changes are not merged (the file has no changes at all, it's only checked out), but the file appears as 'merge conflict' in the pending changes pane.
I've tried with other files, and it worked for them (some correctly added, some correctly checked out and new changes added....)

I think it's gone to be too difficult to find out why (unless you have an idea). So if it appears again I'll make a new post (I've done the merge manually now, it's too late).

Thanks

[Beth]

Thanks for the email. I'll move this thread offline and respond via email.

H: 215177