From mboxrd@z Thu Jan  1 00:00:00 1970
From: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Subject: Re: GSoC 2016: applications open, deadline = Fri, 19/2
Date: Sat, 20 Feb 2016 10:28:46 +0100 (CET)
Message-ID: <alpine.DEB.1.00.1602201027170.20796@bonsai2>
References: <vpqoabox66p.fsf@anie.imag.fr> <20160217172407.GD1831@hank> <448280D1-3EEB-40DF-9886-C9B620E32E3C@gmail.com> <vpqh9h7f9kz.fsf@anie.imag.fr> <1CE3F5E2-DDCC-4F1B-93CF-1A4A194650BF@gmail.com> <CAGZ79kbGyCTdq4P02fNb7tEuvkvqcZviWJp40Ob1ed6=JCh9Xg@mail.gmail.com>
 <xmqq7fi1hlw6.fsf@gitster.mtv.corp.google.com> <vpqr3g96tn6.fsf@anie.imag.fr> <xmqq8u2gcubh.fsf@gitster.mtv.corp.google.com>
Mime-Version: 1.0
Content-Type: TEXT/PLAIN; charset=US-ASCII
Cc: Matthieu Moy <Matthieu.Moy@grenoble-inp.fr>,
	Stefan Beller <sbeller@google.com>,
	Lars Schneider <larsxschneider@gmail.com>,
	Thomas Gummerer <t.gummerer@gmail.com>,
	git <git@vger.kernel.org>, Jeff King <peff@peff.net>,
	Christian Couder <christian.couder@gmail.com>
To: Junio C Hamano <gitster@pobox.com>
X-From: git-owner@vger.kernel.org Sat Feb 20 10:29:21 2016
Return-path: <git-owner@vger.kernel.org>
Envelope-to: gcvg-git-2@plane.gmane.org
Received: from vger.kernel.org ([209.132.180.67])
	by plane.gmane.org with esmtp (Exim 4.69)
	(envelope-from <git-owner@vger.kernel.org>)
	id 1aX3qo-0004RQ-5T
	for gcvg-git-2@plane.gmane.org; Sat, 20 Feb 2016 10:29:18 +0100
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1427185AbcBTJ3M (ORCPT <rfc822;gcvg-git-2@m.gmane.org>);
	Sat, 20 Feb 2016 04:29:12 -0500
Received: from mout.gmx.net ([212.227.15.15]:52300 "EHLO mout.gmx.net"
	rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
	id S1426785AbcBTJ3F (ORCPT <rfc822;git@vger.kernel.org>);
	Sat, 20 Feb 2016 04:29:05 -0500
Received: from surfer-172-29-13-169-hotspot.internet-for-guests.com
 ([91.66.56.192]) by mail.gmx.com (mrgmx002) with ESMTPSA (Nemesis) id
 0MU11l-1aOZNp2TKb-00QnH1; Sat, 20 Feb 2016 10:28:49 +0100
X-X-Sender: gene099@bonsai2
In-Reply-To: <xmqq8u2gcubh.fsf@gitster.mtv.corp.google.com>
User-Agent: Alpine 1.00 (DEB 882 2007-12-20)
X-Provags-ID: V03:K0:GsnejQH2Pl4Gr2Essj5WeWmoHOmBi0ByOpAk8BEw5i7LnkLeyfu
 mU5bh1t4/xciZF04tzdiwgVdYm9ag5uJ+ESv0TO5NfeJ1dYR8zzJgIkaOrhGo00Yj6JHeUl
 Evkl/IVMHcnCZEY/H/QdGhqp6T/3woTeSPmu09+qw3KXQFnNhweNPvOsSsiPNpV6IfWRrhs
 4lb+BBvqnMa6I0D/GEPqQ==
X-UI-Out-Filterresults: notjunk:1;V01:K0:T7pxtaxK9GU=:c6EzrsisMDX44ygd2R3MC1
 dA0FXf3eVOlwl75rVus6/lVoITd2Nkp+rpYy/Plpk7gQXy3/vctDp4TEtJurF+EkpABmnRFjH
 5FEy69LSgPQ2LM4fV6pidzejOQBye2J7BKjeMFUKq9c+0YvaeyqSMHAlL+HlGdzGJKGVOO+4F
 sfx//R1uvGyg+yIDFr5LCbTNdwLq8Xz4IC7ybG4p/hivqPSjNh8RFJ+c/63kHob5I4UdqA1Po
 IQENIVSUrj568u6DTTD8e5SXIenkj8FeM8R29F20r7zDCUTCAcEBeyxvzmM5th1x6eIHQf3FM
 uKKBMZe9RMhtrKn/JEzLnKDI6NE0WjdFRqa8oPaSejIOYBRWQqSuNZYZ+VXASMvG5evmqb8fu
 +ZYnvN+sfo5mbgKmjBqmz0TuozF3ouC2nwyh9y+fjHR95UFWMpaqc2QCvF3HwQ+VQxU/fNFqt
 ZeHgyj0VJrIJXnxwAIt/bXxifo+xZFu8I+ml6k6smwE+XXrS3ivLbtf11AqVTS0ncBefkGvyQ
 OR0fMf3npuWfVK206azN3YIfMeplz4Du+bGPzqKIzuCzfqMEMwesucrYfGw96i4wgTH7TENYW
 tqWFpo6YDbQx6NWG2kLjoE9TtVZ4iJ6dJPEZbBC9slLdu1aSzDeNZS7v5wpiOGt30kU5hP+bH
 mD2rHQxdZHCzNy1OI8Zwk1Fs3q079wGzlxsqHd6+xNHEPZ2SOX424wNIcvW/VA4gKQH8wsK+U
 CH5CJir2tXOtawgUYA51OD387+vv9VY/HcxfGJbqee4JVSBApyljoi6sxu4PG1cm2gWW4kfs 
Sender: git-owner@vger.kernel.org
Precedence: bulk
List-ID: <git.vger.kernel.org>
X-Mailing-List: git@vger.kernel.org
Archived-At: <http://permalink.gmane.org/gmane.comp.version-control.git/286776>

Hi Junio,

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

> 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