git/list[1] front-page[2] threads[3] people[4] search[5] about
 

merge into branch currently not active / checked out

From
TGThomas Glanzmann <thomas@glanzmann.de>
Date
Jun 17, 2007, 07:22 UTC
Message-ID
<20070617072225.GF23473@cip.informatik.uni-erlangen.de>

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: Junio C Hamano
Message 1 of 5 in “merge into branch currently not active / checked out”
  1. Thomas GlanzmannJun 17, 2007
  2. Junio C HamanoJun 17, 2007
  3. Thomas GlanzmannJun 17, 2007
  4. Karl HasselströmJun 20, 2007
  5. Alex RiesenJun 17, 2007

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.