我已按照命令行上的说明进行操作:
https://docs.microsoft.com/zh-cn/azure/devops/repos/git/merging?view=azure-devops&tabs=visual-studio



我要做的就是解决这种合并冲突所引起的抱怨。

要明确的是,我做了一个git pull,它说Already up to date.

我也尝试过:

git pull origin feature/ENGA-2514
From ssh.dev.azure.com:v3/nfib/NfibEnterprise/engage.mobile
 * branch                feature/ENGA-2514 -> FETCH_HEAD
Already up to date.


我也尝试过:

git log --merge
fatal: --merge without MERGE_HEAD?


哪里是难以捉摸的合并冲突吗?

#1 楼

尝试以下解决方案:拉取请求合并冲突扩展。它有助于解决拉取请求页面内的冲突。

#2 楼

我不确定此选项卡是否会100%出现,您仍然必须在本地合并某些情况,但是您可以在最近的UI更新中合并某些PR,而无需任何扩展。


#3 楼

对我来说,我无法解决这些冲突。
要预防它们:
  i) Make backups outside the folder system for the repository

 ii) Totally delete your 'local' folder for the repository.  (Seems
     counterintuitive, but it is all that works for me).  

iii) Re-load 'local' folder from the web-repository.

 iv) Eventually, check-in, then it will work.

  v) Repeat step i for next time.