From: "Sverre Rabbelier" <alturin@gmail.com>
To: "Luca Siciliano Viglieri" <lsiciliano@web.de>
Cc: git@vger.kernel.org
Subject: Re: Help merging two repo without connection
Date: Sun, 16 Nov 2008 16:06:55 +0100 [thread overview]
Message-ID: <bd6139dc0811160706l4dfad335wc4048cd3cfca80ec@mail.gmail.com> (raw)
In-Reply-To: <AB681AEE-D229-4F1C-8D7B-8E60E0ED8E96@web.de>
On Sun, Nov 16, 2008 at 15:59, Luca Siciliano Viglieri
<lsiciliano@web.de> 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
next prev parent reply other threads:[~2008-11-16 15:08 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-11-16 14:59 Help merging two repo without connection Luca Siciliano Viglieri
2008-11-16 15:06 ` Sverre Rabbelier [this message]
2008-11-16 15:33 ` Peter Harris
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=bd6139dc0811160706l4dfad335wc4048cd3cfca80ec@mail.gmail.com \
--to=alturin@gmail.com \
--cc=git@vger.kernel.org \
--cc=lsiciliano@web.de \
--cc=sverre@rabbelier.nl \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).