David Turner writes:
> I could set my .gitattributes for the .gitmodules file to use a
> custom merge driver. But: (a) I don't see an off-the-shelf one
> that does what I want ("union" happens to work in the add/add
> case, but not in the add/remove case or other cases) and (b) I
> would have to
Consider two commits: one adds file A, and the other adds file B. These
commits don't conflict; you can merge them with no problem.
But if the two commits instead add submodules A and B, and you try to merge,
you'll likely get a conflict in .gitmodules. This seems wrong; .gitmodules
happens t
2 matches
Mail list logo
