TFS 2013: Automerge not working
I have to do a merge between our chest and branch and we have a lot of modified files.
Most of the changes do not conflict, but currently when I try to merge a branch I have a lot of files to resolve automatically.
I have an "AutoMerge" button, but when I click on it, it just opens the same tool as if I click on "Merge Changes in the Merge Tool".
Also, when I'm in that tool, if I click Next Conflict, I don't have it and I can click Accept Merge right away.
I tried to do AutoResolve everything, but it tells me "The conflict was not resolved due to conflicting content changes, name changes, or encoding changes. These conflicts must be resolved individually."
So, any idea of why and how to resolve all these files without conflicts would be more than welcome, as I have over 800 files to view otherwise.
Many thanks
I don't know if it affected anything, but currently we have Visual Studio 2013 and TFS 2010.
source to share
I had this problem too. In my case, my output was giving the message "Could not determine the get operation because the file already exists locally" for each file after I did get. I searched for this issue and found TFS Incremental build error - The get operation failed because the file already exists locally .
My project folder was no longer set read-only due to a mess with another issue that led to this issue. I ended up doing a full overwrite for all files (right click -> Advanced -> Get specific version, select latest version and check "overwrite all files") and it solved my problem. This is probably not a solution for all cases, but something worth checking out.
source to share