Re: GSoC 2019: Git's application submitted

From: Thomas Gummerer <t.gummerer@gmail.com>
Date: Feb 5, 2019, 21:17 UTC
Message-ID: <20190205211736.GD6085@hank.intra.tgummerer.com>
In-Reply-To: <20190204215251.GB6085@hank.intra.tgummerer.com>

[Dropped Stefan from the Cc list, as his email bounces]

On 02/04, Thomas Gummerer wrote:

Show 7 quoted lines

> On 02/04, Christian Couder wrote:
> > It would be nice to have a few more project ideas.
> > https://git.github.io/SoC-2019-Ideas/ currently lists only 2 possible
> > projects:
> 
> Thanks for putting this together.  I'm going to have a look at the
> project list over the next couple of days.

Here's an idea, that I think could make a good GSoC project. Dscho mentioned this to me at Git Merge, and I liked the idea, but I'd like to get some feedback on the list first before adding it to the project list, to get others opinions on the feasibility.

The idea is to add an option to 'git stash push', so it can stash merge conflicts, and restore them with 'git stash pop'. The various stages of the files could be represented as commits, and the stash commit would be an octopus merge of those commits, so they could be re-created later. The same idea can also be extended to store staged vs. unstaged changes, so we can re-create the index state as it was before creating the stash.

Thoughts?