Hi,
Following the discussion on merge with uncommited changes inside the
git pull --autostash thread, I did a bit of testing, and encountered a
case with silent data loss. In short: merge a branch introducing changes
to a file. If the file has been renamed in the current branch, then git
merge
Am 4/22/2013 11:24, schrieb Matthieu Moy:
Following the discussion on merge with uncommited changes inside the
git pull --autostash thread, I did a bit of testing, and encountered a
case with silent data loss. In short: merge a branch introducing changes
to a file. If the file has been renamed
Johannes Sixt j.s...@viscovery.net writes:
Am 4/22/2013 11:24, schrieb Matthieu Moy:
Following the discussion on merge with uncommited changes inside the
git pull --autostash thread, I did a bit of testing, and encountered a
case with silent data loss. In short: merge a branch introducing
Matthieu Moy matthieu@grenoble-inp.fr writes:
I could have expected git merge --abort to fail, but the problem is
really more serious here: data loss is done silently before giving me an
opportunity to do or abort anything.
I think this is a well known and longstanding failure case in the
4 matches
Mail list logo
