Concrete sample merges of git that won't work in SVN
git, merge, svn
Solution
Found an article with a nice sample. The "team b" branch is only created to show the tree conflict with creating the same directory in two branches. Here is an overview:
Problem
I'm looking for concrete sample merges that will work in git, but will result in a conflict in SVN. In addition to that, samples of hard/painful SVN merges that you never tried in Git would also be fine. There are mainly four categories of merges I could identify in relation to my question: - big bang merges - rename/move related merges - created directories/identical files in both branches - criss cross merges Did I miss any scenarios here? Finding samples for 1-3 is trivial (Find a sample for 2 in the comments, 3 as part of my answer and 1 is nearly any rebase). Has anybody a sample (that doesn't look to academic) for a successful criss cross merge, which will fail in SVN?