合并回曾经被还原的东西 [英] merge back what once was reverted

问题描述

我有一个错误的提交，我通过 svn merge -c -1160 还原.，然后是时候再次尝试提交了，所以我想将修订版 #1160 合并回 HEAD，但是谷歌搜索后找不到解决方案.我尝试了 svn merge -c 1160 .(第一个没有-"符号)但没有运气.

I had a bad commit what I reverted by svn merge -c -1160 ., then it's time to try with the commit again so I wanted to merge the revision #1160 back to the HEAD but couldn't find the solution after googling. I tried svn merge -c 1160 . (the first without the "-" sign) but had no luck.

有什么想法吗?

推荐答案

需要使用

svn merge -c 1160 . --ignore-ancestry

这篇关于合并回曾经被还原的东西的文章就介绍到这了，希望我们推荐的答案对大家有所帮助，也希望大家多多支持IT屋！