Git please change stash

1 pointsingularity20010 comments

Normal git tooling creates different files file.ORIG file.LOCAL file.REMOTE in case of conflicts.

However `git stash pop` manipulates your files directly resulting in lines like:

<<<<<<< Updated upstream

>>>>>>> Stashed changes

This can seriously corrupt files and workflows.

If it is «the user's fault» or negligence then at least I'm not the only one:

https://github.com/search?q=Stashed+changes&type=Code

300000 'idiots' might hint at a UX problem.