如何在git和svn仓库之间进行区分 [英] How to diff between a git and svn repos

问题描述

我最近在github上创建了一个项目，并在磁盘上进行了克隆.在发现其他人也从事该项目之前，我正在从事与SVN相同的项目.我没有对SVN仓库的写权限.我的磁盘上只有一个更改的副本.现在，我有了自己的git和SVN的克隆.

I recently forked a project in github and made a clone on my disk. I was working on this same project which I had on SVN before I find that someone else also worked on it. I don't have write access on SVN repo. I only have a changed copy on my disk. Now I have a clone of my own git and a SVN clone.

我想将我在SVN副本中的更改应用于我的git克隆.您知道Windows的任何工具都能提供帮助吗?我知道 git-svn 会执行类似的操作，但是我不确定是否可以使用SVN的本地副本.

I want to apply my changes in SVN copy to my git clone. Do you know any tool for Windows which can help? I know git-svn does something similar but I am not sure if it would work with a local copy of SVN.

其实我想合并两个仓库.我正在寻找的一项非常重要的功能是为我完成合并的每个文件设置完成标志.

Actually I want to merge two repos. Edit 2: A very important ability which I am looking for is to set a done flag for each file I am finished merging.

推荐答案

我不知道这是否是最好的方法，但它是可行的解决方案.我要做的是首先从工作副本中创建一个SVN存储库，然后将其转换为git存储库.然后，我从原始的git repo中获取了它并进行了合并.这样，我们可以轻松地查看有冲突的文件并解决它们.

I don't know if it is the best way or not but it is a feasible solution. What I did was to first create a SVN repo from my working copy, then converted it to a git repo. Then I fetched it from the original git repo and merged. This way we can easily see the conflicting files and resolve them.

这篇关于如何在git和svn仓库之间进行区分的文章就介绍到这了，希望我们推荐的答案对大家有所帮助，也希望大家多多支持IT屋！