From: Karsten Fluegge <info@pannous.com>
To: git@vger.kernel.org
Subject: please change stash
Date: Mon, 12 Feb 2018 16:04:49 +0100 [thread overview]
Message-ID: <5f712f6e-ecb4-db85-02de-b48be1bf1f44@pannous.com> (raw)
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
next parent reply other threads:[~2018-02-12 15:04 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <76c2d8b6-b001-8ae5-4e66-fdeed4a1190a@pannous.com>
2018-02-12 15:04 ` Karsten Fluegge [this message]
2018-02-13 0:52 ` please change stash Andrew Ardill
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=5f712f6e-ecb4-db85-02de-b48be1bf1f44@pannous.com \
--to=info@pannous.com \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).