From: Christos Trochalakis <yatiohi@ideopolis.gr>
To: git@vger.kernel.org
Subject: Maintaining a fork workflows
Date: Fri, 12 Feb 2010 11:23:44 +0200 [thread overview]
Message-ID: <f7b87f7c1002120123t376f3f14ma3f3bcb21ae2836@mail.gmail.com> (raw)
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?
thanks,
chris
next reply other threads:[~2010-02-12 9:49 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-02-12 9:23 Christos Trochalakis [this message]
2010-02-12 12:37 ` Maintaining a fork workflows Michael Poole
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=f7b87f7c1002120123t376f3f14ma3f3bcb21ae2836@mail.gmail.com \
--to=yatiohi@ideopolis.gr \
--cc=git@vger.kernel.org \
/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).