Rogan Dawes wrote: > It seems to me that git is smart enough to figure out where contents get > moved to, once. Of course, if you have conflicting moves in the same > repo, git's automation falls down. So, if you need to move the "same" > file in different repositories to different places, you need to do it > via an intermediate repo that will be able to "remember" which movement > you chose. You don't need a whole different repo, branches are good enough. git checkout gentoo-integration git pull gentoo git checkout sunrise-integration git pull sunrise git checkout master git merge gentoo git merge sunrise The integration branches can remember your local changes to the remotes (like the move of packages.mask) -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
