Re: [wiki.synchro.net] page changed: howto:git
By: wiki.synchro.net to All on Sun Oct 04 2020 01:58 pm
Wiki edit of http://wiki.synchro.net/howto:git by digital man:
Stash: solve error: Your local changes to the following files would be overwritten by merge
You should probably mention, that if you have any CONFLICTs after the "git stash pop", that they probably be resolved otherwise they will have unknown impacts.
I know that the "git diff" step 5 may show them (a different way, well as not a conflict to the untrained eye) and I can see you being bombarded with "it wont ...." messages, which will be hard to help if folks dont tell you they got a conflict on the stash pop.
Unrelated EG:
#git stash pop
Auto-merging Dockerfile
CONFLICT (content): Merge conflict in Dockerfile
#git diff
diff --cc Dockerfile
index a97fc9f,19e169e..0000000
-+- a/Dockerfile
+++ b/Dockerfile
@@@ -1,42 -1,28 +1,54 @@@
# NAME leenooks/php
++<<<<<<< Updated upstream
+# VERSION 7.4-fpm-mp
++=======
+ # VERSION 7.2-fpm-db2
Stashed changes
(Been there, done that, should have got a Tshirt for it.)
...δεσ∩
... When in doubt, predict that the trend will continue.
---
■ Synchronet ■ Alterant | an SBBS in Docker on Pi!