我正在合并一个可能有很多冲突的远程分支.我怎么知道它是否会有冲突？
我没有看到像什么--dry-run的git-merge.
有没有办法模拟git merge两个分支,当前工作分支和主分支,但没有做任何更改？
当我不得不做一个时,我经常会有冲突git merge.有没有办法先模拟合并？
我已经创建了一个git存储库并添加了一个文本文件.这是100%用于学习目的.
我在文本文件中添加了"1"并将其提交给master.
从master创建一个新分支并附加"2".
最后,从master创建了一个分支并附加了"3".
您能解释一下这个或任何其他场景中可能发生的冲突吗？
I was wondering how to check if a pull request has conflicts on GitHub using a script from my PC? There is a nice solution mentioned here to do it via GitHub actions: /sf/answers/5018458931/
However, taking the same script from https://olivernybroe/action-conflict-finder and running it on my PC won't work unless I do a local merge. After identifying the conflicts I would have to discard the local merge. This process seems inefficient and I was looking for a "cleaner" and faster …