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

Re: who's on first? - following first parent and merge-management

From
HHHolger Hellmuth <hellmuth@ira.uka.de>
Date
Mar 9, 2012, 12:05 UTC
Message-ID
<4F59F212.6030701@ira.uka.de>
In-Reply-To
<7vpqcndmpa.fsf@alter.siamese.dyndns.org>
On 08.03.2012 18:30, Junio C Hamano wrote:
Show 11 quoted lines
> Johannes Sixt<j.sixt@viscovery.net>  writes:
>> To avoid the situation,...
>> This would not be necessary if the order of the merge parents could be
>> specified, e.g.:
>>
>>     # on topic
>>     git merge --into master
>
> I think the underlying mechanism needed to implement the above
> shares a lot with what Jeff called "crazy idea", but where you would
> want to be after such a merge may be different in these two cases.

I don't think there is much question that you should still be in the same branch. Not because you necessarily want to be in that branch. But because it would be surprising if git-merge changed your branch sometimes and most times not.

Previous: Junio C HamanoNext: Johannes Sixt
Message 8 of 13 in “who's on first? - following first parent and merge-management”
  1. Neal KreitzingerMar 7, 2012
  2. Junio C HamanoMar 7, 2012
  3. Junio C HamanoMar 8, 2012
  4. Jeff KingMar 8, 2012
  5. Junio C HamanoMar 8, 2012
  6. Johannes SixtMar 8, 2012
  7. Junio C HamanoMar 8, 2012
  8. Holger HellmuthMar 9, 2012
  9. Johannes SixtMar 9, 2012
  10. Holger HellmuthMar 9, 2012
  11. Junio C HamanoMar 9, 2012
  12. Jonathan NiederMar 8, 2012
  13. Junio C HamanoMar 8, 2012

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.