From: Thomas Glanzmann <thomas@glanzmann.de>
To: GIT <git@vger.kernel.org>
Subject: merge into branch currently not active / checked out
Date: Sun, 17 Jun 2007 09:22:25 +0200 [thread overview]
Message-ID: <20070617072225.GF23473@cip.informatik.uni-erlangen.de> (raw)
Hello,
is it possible to merge into a branch currently not active/checked out?
I have the following scenario:
- One branch per feature (cstatus, headers, mutt-collapse-flags, small-fixes)
- One upstream branch (master)
- One branch that has every feature branch (tg)
(faui00u) [~/work/mutt/mutt] git branch
cstatus
headers
master
mutt-collapse-flags
small-fixes
* tg
I want to merge master in every of the feature branches. Is that possible or
just bullshit because I don't have a working tree to handle conflicts?
Thomas
next reply other threads:[~2007-06-17 7:22 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-06-17 7:22 Thomas Glanzmann [this message]
2007-06-17 9:27 ` merge into branch currently not active / checked out Junio C Hamano
2007-06-17 10:16 ` Thomas Glanzmann
2007-06-20 7:54 ` Karl Hasselström
2007-06-17 9:45 ` Alex Riesen
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=20070617072225.GF23473@cip.informatik.uni-erlangen.de \
--to=thomas@glanzmann.de \
--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