CODEWITHSUNDEEP
svngitversion-controlgit-svn
lprsd
lprsd

Reputation: 87095

Working with git-svn: Proper workfllow

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.

Upvotes: 0

Views: 963

Answers (1)

miku
miku

Reputation: 188024

Just a few readings regarding git svn workflows:

Upvotes: 1

Related Questions