git svn dcommit fail

Question

when I do git svn dcommit, it report error like below:

git svn dcommit
Committing to http://192.168.33.203/svn/repos/mt6577/platform/branches/vendor-ALPS.ICS2.6577.SP.V1_HUAQIN77_CU_ICS ...
summit merge conflict: file or directory “mediatek/platform/mt6577/external/meta/sgx” is out of date；please update: resource out of date; try updating at /usr/local/libexec/git-core/git-svn line 579 

My operations:

1. do three commits(commit34,commit35,commit36) in local

2. git svn dcommit these three commits to svn

3. amend commit34,commit35 by rebase command

4. git svn dcommit , then report above error.

How to handle the error, thanks much.

Answer 1

First thing, never rebase commits that you have pushed back to repository when using git. Although you are working with git-svn, rebase these commits is not a good idea. Why? Because rebase alters the commit history, this is ok when you just work in local.

In your case, you can run git svn fetch/rebase and resolve any conflict, then dcommit it back.