我尝试将我的更改从我当地的git repro推送到我公司的SVN-repro。
从svn拉取并合并所有更改后，我尝试拒绝我的更改。
git svn dcommit
但是我收到了这个错误：
unable to determine upstream svn information from working tree history
或
Unable to determine upstream SVN information from HEAD history.
Perhaps the repository is empty. at C:\Program Files (x86)\Git/libexec/git-core\git-svn line 852.
..所以我尝试使用SmartGit，但我得到了另一个错误
Push: svn: E160024: File or directory 'trunk' is out of date; try updating svn: E160024: resource out of date; try updating svn: E175002: CHECKOUT of '/svn/entwicklung/!svn/ver/21045/trunk': 409 Conflict (http://le-svn)
$ git.exe update-index --refresh
$ git.exe diff-files --quiet --ignore-submodules
$ git.exe diff-index --cached --quiet --ignore-submodules HEAD --
$ git.exe update-index --refresh
$ git.exe diff-files --quiet --ignore-submodules
$ git.exe diff-index --cached --quiet --ignore-submodules HEAD --
$ git.exe checkout -q 09fc6832ef3111c2c69d29ba3329b20a365c38b3
$ git.exe merge -q --squash 09fc6832ef3111c2c69d29ba3329b20a365c38b3 8b230b96baecb4a2bfbc48f7ba68d42ef2bbba20 0ff6eca016d2b00ab3ab58fffd59a2379c839d6a
Trying simple merge with 8b230b96baecb4a2bfbc48f7ba68d42ef2bbba20
Trying simple merge with 0ff6eca016d2b00ab3ab58fffd59a2379c839d6a
Automatic merge went well; stopped before committing as requested
Squash commit -- not updating HEAD
$ git.exe commit -q --message Message --allow-empty
$ git.exe checkout -q 6820736762c3fac3c942db0f8e54f150e062e49c
$ git.exe merge -q --squash 6820736762c3fac3c942db0f8e54f150e062e49c cf4da94860388a444028bdece93e421d8cf30102 231bad85bd61cbce1a1a381b9275ed3309f37779
Trying simple merge with cf4da94860388a444028bdece93e421d8cf30102
Trying simple merge with 231bad85bd61cbce1a1a381b9275ed3309f37779
Squash commit -- not updating HEAD
Automatic merge went well; stopped before committing as requested
$ git.exe commit -q --message Message --allow-empty
$ git.exe checkout -q --force refs/heads/trunk
$ git.exe reset --hard refs/heads/trunk --
HEAD is now at 3c1dc41 Merge branch 'svn/trunk'
我做错了什么？