From: Michael Poole <mdpoole@troilus.org>
To: Christos Trochalakis <yatiohi@ideopolis.gr>
Cc: git@vger.kernel.org
Subject: Re: Maintaining a fork workflows
Date: Fri, 12 Feb 2010 07:37:31 -0500 [thread overview]
Message-ID: <87k4uid3zo.fsf@troilus.org> (raw)
In-Reply-To: <f7b87f7c1002120123t376f3f14ma3f3bcb21ae2836@mail.gmail.com> (Christos Trochalakis's message of "Fri, 12 Feb 2010 11:23:44 +0200")
Christos Trochalakis writes:
> Hello, I have created a light fork of an upstream project and I am not
> quite sure which "syncing with upstream" workflow fits better.
>
> I can think of 3 solutions
> 1. the obvious one, merge the upstream changes on the forked branch
> and make the necessary modifications on the merge commit
> 2. Rebase upstream commits on top of the fork & make a commit with the
> necessary modifications
> 3. Cherrypick & modify upstream commits
>
> Which practice is considered better?
I would recommend #1 if you expect other people to base work on your
tree, and #2 if you don't. #1 preserves both tree's histories, rather
than occasionally rewriting your tree's history like #2 does. #3 at
best hides the relationship between the upstream history and the
cherry-picked commits, which is why it isn't a serious contender to me.
Michael Poole
prev parent reply other threads:[~2010-02-12 12:37 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-02-12 9:23 Maintaining a fork workflows Christos Trochalakis
2010-02-12 12:37 ` Michael Poole [this message]
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=87k4uid3zo.fsf@troilus.org \
--to=mdpoole@troilus.org \
--cc=git@vger.kernel.org \
--cc=yatiohi@ideopolis.gr \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.