Re: GSoC 2016: applications open, deadline = Fri, 19/2

From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Feb 20, 2016, 09:28 UTC
Message-ID: <alpine.DEB.1.00.1602201027170.20796@bonsai2>
In-Reply-To: <xmqq8u2gcubh.fsf@gitster.mtv.corp.google.com>

Hi Junio,

On Fri, 19 Feb 2016, Junio C Hamano wrote:

Show 6 quoted lines

> The "experimenting" would include mergy operations like "am -3" and
> "cherry-pick".  "After queuing a topic and trying it in isolation, an
> attempt to merge to the baseline results in quite a mess, and I give
> up"--there is nothing to salvage.
> 
> And obviously, "stash" is not useful in such a situation.

I think this is more a short-coming of "stash" than anything else.

Many a times did I wish I could simply quickly stash a failed merge and then come back later. Or not. Just like stashed changes without conflicts allow me to do already.

Ciao, Dscho

$ 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.