I created a topic branch from the master; made some commits. Then checked out

Question

Editorial Team

Asked: May 13, 20262026-05-13T19:55:29+00:00 2026-05-13T19:55:29+00:00

I created a topic branch from the master; made some commits.

Then checked out the master; rebased it on the svn and merged the topic branch.

There were no commits on the master itself, so the merge was fast-forward.

Now, when I try to svn dcommit it gives me merge conflicts! wtf? Clearly there is a linear history on the master.

The workflow I follow is:

Is there a better way to deal with git-svn. I am not sure, I am using it rightly to create any distinctive advantage over using svn alone.

You must login to add an answer.

Need An Account,

Editorial Team · Answer 1 · 2026-05-13T19:55:30+00:00

Editorial Team

Just a few readings regarding git svn workflows:

The Archive Base Latest Questions