3

I have reviewed the web attempting to find a solution to this. I have two development branches and one main branch (production). I need to merge my two development branches together and then merge that joined dev branch to live (main). When I attempt to merge the two dev branches together the only target branch that I get is live/main. Any ideas on how to do this? Is this even possible?

4

1 回答 1

6

单击“浏览”按钮，然后浏览到要合并到的分支。它会在合并窗口中向您发出警告，说明您即将进行毫无根据的合并。

然而，这确实不是最好的方法。将两个分支（单独）合并到主分支中，然后将主分支拉入每个开发分支。然后一切都是最新的，您将合并冲突最小化（您将确切地知道冲突来自何处），并且您不必进行毫无根据的合并（这将在您的两个开发分支之间建立永久关系）。

于 2012-09-10T16:29:18.063 回答