Hi Thomas, On Tue, 5 Feb 2019, Thomas Gummerer wrote: > 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? Yep, would make for a good GSoC project, as it is straight-forward to implement and easy to structure, there is no exploratory work needed. Ciao, Dscho
