如何在 Android Studio 2.0 中将特定的 svn 修订版从分支合并到主干 [英] 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 :

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.

Are you sure?

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

Thanks

解决方案

I've find out what was wrong.

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

The problem was in wrong path to my trunk location:

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

https://my_trunk

instead of

https://my_trunk/my_concrete_trunk_folder

---

---

After I specified location of trunk I got the dialog I wanted:

---

这篇关于如何在 Android Studio 2.0 中将特定的 svn 修订版从分支合并到主干的文章就介绍到这了，希望我们推荐的答案对大家有所帮助，也希望大家多多支持IT屋！