如何合并来自分支主干具体SVN版本Android Studio中2.0 [英] How do merge specific svn revisions from branch to trunk in Android Studio 2.0

问题描述

前段时间有一个伟大的窗口，在那里我可以选择我想合并哪个版本。而最近新对话框中开始出现。它说：

Some time ago there was a great window where I could choose which revisions I want to merge. And recently the new dialog started to appear. It says :

这将使分支 https：//开头my_branch 不再可用于进一步的工作。它将不能正确地吸收新干线（的https：// my_trunk 的）的变化，也不能该分支被正确重返再次主干。

This will make branch 'https://my_branch' no longer usable for further work. It will not be able to correctly absorb new trunk (https://my_trunk) changes, nor can this branch be properly reintegrated to trunk again.

您确定吗？

但我不希望它重新融入社会。我只是想合并了一些修订。我仍然可以做Android Studio中

But I don't want to reintegrate it. I just want to merge a few revisions. can I still do that in Android Studio

感谢

推荐答案

我已经找出什么是错的。

I've find out what was wrong.

它不依赖于Android Studio版本。

It doesn't depend on the version of Android Studio.

的问题是在错误的道路，以我的树干位置：

我的树干文件夹包含多个文件夹（是的，它是坏的），并在SVN的配置有：

My trunk folder contains multiple folders (yes, it's bad) and in configuration of SVN there was:

https：//开头my_trunk

而不是

https：//开头my_trunk / my_concrete_trunk_folder

https://my_trunk/my_concrete_trunk_folder

我指定中继线的位置我得到了我想要的对话框后：

这篇关于如何合并来自分支主干具体SVN版本Android Studio中2.0的文章就介绍到这了，希望我们推荐的答案对大家有所帮助，也希望大家多多支持IT屋！