From: Karsten Fluegge Date: Mon, 12 Feb 2018 15:04:49 GMT Subject: please change stash Message-ID: <5f712f6e-ecb4-db85-02de-b48be1bf1f44@pannous.com> In-Reply-To: <76c2d8b6-b001-8ae5-4e66-fdeed4a1190a@pannous.com> Dear great team, 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 we're not the only one: https://github.com/search?q=Stashed+changes&type=Code 300000 'idiots' might hint at a UX problem. (factor 10 in darknet) -- Kind regards, Karsten Flügge, CEO GmbH Hagenkampsweg 10 25474 Hasloh Germany Mobile +49-176-64638989 Support +1-855-447-2666 E-Mail info@pannous.com Homepage pannous.com Handelsregister: Amtsgericht Pinneberg HRB 7795 PI Sitz der Gesellschaft: Hasloh Steuernummer: 18/291/16961 USt-Id Nr: DE264064657 CEO: Karsten Flügge -- Kind regards, Karsten Flügge, CEO GmbH Hagenkampsweg 10 25474 Hasloh Germany Mobile +49-176-64638989 Support +1-855-447-2666 E-Mail info@pannous.com Homepage pannous.com Handelsregister: Amtsgericht Pinneberg HRB 7795 PI Sitz der Gesellschaft: Hasloh Steuernummer: 18/291/16961 USt-Id Nr: DE264064657 CEO: Karsten Flügge