CODEWITHSUNDEEP
gitsvnversion-control
MiamiBeach
MiamiBeach

Reputation: 3487

Git workflow: whats the difference from SVN?

I have read these two papers about git workflow:

As far as I understand, the model is simple:

  1. we have a develop branch (ex-trunk),
  2. we create feature branches to be merged into develop when ready,
  3. we make release branch when all the features are implemented and we merge release branches into master in one commit when everything is ready (and to develop just for integrity).
  4. Finally we tag master branch.

Well, a question is:

  1. Is there any significant differences from this model in some other examples of GitWorkflow?
  2. If no, what are the differences between this model and standart SVN development? Why we call it "GitWorkflow" - I cannot see any difference with standart SVN development scheme. We can do the same with SVN. And we do :)

So is this way really called GitWorkflow, or may be there are some points I have missed?

Upvotes: 1

Views: 722

Answers (1)

Lazy Badger
Lazy Badger

Reputation: 97282

As far as I understand, the model is simple

Your understanding is massively wrong

  • GitFlow is rather complex workflow
  • GitFlow assumes a set of families of purpose-oriented branches (feature*, hotfix*, release*) with a lot of predefined rules for order and direction of cross-branch merges

what are the differences between this model and standart SVN development?

  1. "Standard" SVN development doesn't exist - there are at least 2 widely-used SVN-workflows ("stable trunk" vs "unstable trunk|no branches")
  2. Any SVN-workflow assumes as few merges, as possible (SVN-merges are still some headache), GitFlow built around intensive merging between special-purpose branches

Upvotes: 1

Related Questions