SmartGit：文件或目录不是过时的错误消息？ [英] SmartGit: File or Directory out of date error message when it is not?

问题描述

这是一个SVN仓库。

可以看到，我有两个分支并对发布进行了一些独立的更改。根据上面的日志，两个服务器分支都映射回当前的一些本地发布分支，这是少数提交的。

如果我将版本的更改推送回远程服务器。我收到以下错误：

看起来错误与SVN问题409冲突有关，但是四处搜索并没有显示任何有用的信息。
$ b

所以我试着从远程的trunk和release分支上拉动变化，并且没有发生新的变化。为什么我收到一条错误消息，指出我的本地分支已过期？

解决方案

嗯，我无法解释是什么导致了这个问题。

我可以通过软重置回上面照片中显示的远程发布分支来解决问题。这导致我的更改没有提交，但没有丢失，我可以重新发送并推送更改，而不会出现SVN 409 Conflict错误。

Someone please help me understand my mistake/misunderstanding of what's happening below:

This is an SVN repository.

As you can see, I have two branches and committed a few independent changes to the release. According to the log above, both server branches map back into the current local release branch which is a few commits ahead.

If I go to push the changes of release back to the remote server. I get the following error:

It would seem the error is some how related to an SVN problem "409 conflict" but searching around doesn't reveal any useful information.

So I've tried pulling changes from both trunk and the release branch on remote and neither have new changes. Why am I getting an error message that my local branch is out of date?

解决方案

Well I can't explain what caused the problem.

I was able to resolve the issue by doing a soft reset back to the remote release branch shown in the photo above. This resulted in my changes being uncommitted but not lost and I was able to recommit and push the changes without the SVN 409 Conflict error.

这篇关于SmartGit：文件或目录不是过时的错误消息？的文章就介绍到这了，希望我们推荐的答案对大家有所帮助，也希望大家多多支持IT屋！