From: Sverre Rabbelier Date: Sun, 16 Nov 2008 15:06:55 GMT Subject: Re: Help merging two repo without connection Message-ID: In-Reply-To: On Sun, Nov 16, 2008 at 15:59, Luca Siciliano Viglieri wrote: > Hi, > i'm trying to keep synched two repositories without always having a direct > connection. > My situation is the following: > I have a project on my computer with GIT repo. > Another developer visited me and cloned my repository connecting the two > computer (for example via SSH). > Than i sent him for the next days patched of my changes but when he came and > we merged i got the following tree: I suspect 'git rebase' might help you out. When you apply the patches, apply them to the branch they were based off (instead of to the most recent master), and then rebase -that- branch (with your 'git am'-ed patches from your other box) onto your most recent master. That way you should be able to keep a linear history :). -- Cheers, Sverre Rabbelier