Hi Karsten,
> Normal git tooling creates different files file.ORIG file.LOCAL
> file.REMOTE in case of conflicts.
Which tools are you referring to here? Can you give a short sequence
of commands that show what you mean?
> However `git stash pop` manipulates your files directly resulting in
> lin
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.
2 matches
Mail list logo