From: Patrick Sabin <patrick.just4fun@gmail.com>
To: git@vger.kernel.org
Subject: git workflow - merging upwards
Date: Thu, 16 Aug 2012 21:49:02 +0200 [thread overview]
Message-ID: <502D4EAE.9010704@gmail.com> (raw)
I read through gitworkflows and want to use the Merge Upwards rule in my
projects:
"Always commit your fixes to the oldest supported branch that require
them. Then (periodically) merge the integration branches upwards into
each other."
This looks great but I have some trouble in the case if I want to have
a change in an older branch and don't want to propagate the change to
the newer branches. Let's say I have a v1.1 and a v1.2 and now a have
a bug fix/workaround which only affects version v1.1 but not v1.2. If
I commit to v1.1 then the periodical merge would merge the change to
v1.2 which is what I don't want.
Any ideas/workarounds for that problem?
--
Patrick
next reply other threads:[~2012-08-16 19:49 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-08-16 19:49 Patrick Sabin [this message]
2012-08-16 20:43 ` git workflow - merging upwards Junio C Hamano
2012-08-17 8:14 ` Patrick Sabin
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=502D4EAE.9010704@gmail.com \
--to=patrick.just4fun@gmail.com \
--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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).