4 ms·
Union-merging is insane and thus should take some insane understanding of what you're doing before you can do it. Anyone that's merging two unrelated repositori
by windsurfer 15y ago
Union-merging is insane and thus should take some insane understanding of what you're doing before you can do it. Anyone that's merging two unrelated repositories should understand what's going on under the hood anyways.
What you're doing in git actually makes sense, since a normal pull is just fetch+checkout+merge+commit, you have to go into the plumbing and trick every step of the way to fetch, checkout, and merge using the wrong repositories. In the future, this could be made porcelain as it has been in hg, but do people really want to do this? It's much safer and saner to use submodules for 99% of use cases.
- EGreg 15y agoI still think people prefer git to mercurial these days (if we ignore github) for the same reason they prefer vim because real programmers use butterflies. http://xkcd.com/378/ http://xkcd.com/378/