On Thu, Jun 26, 2008 at 11:45 AM, Miklos Vajna <vmiklos@xxxxxxxxxxxxxx> wrote: > On Thu, Jun 26, 2008 at 11:39:37AM +0200, Christian MICHON <christian.michon@xxxxxxxxx> wrote: >> How would you do it, since merge will not merge if it cannot find a >> common ancestor ? > > Did you try so? yes I did. it was failing. > > If there are no conflicting paths then a simple > > git pull /path/to/other/repo.git master pull = fetch + merge maybe I was not fetching the objects properly. > > or similar should work. > your hint works fine. thanks! I was starting considering rebasing the 2 repos on a common empty commit (that would have been desperate)... -- Christian -- http://detaolb.sourceforge.net/, a linux distribution for Qemu with Git inside ! -- 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
