Commit 35d2fffd introduced 'git merge --abort' as a synonym to 'git reset
--merge', and added some failing tests in t7611-merge-abort.sh (search
'###' in this file) showing that 'git merge --abort' could not always
recover the pre-merge state.
Still, in many cases, 'git merge --abort' just works,
Matthieu Moy wrote:
Weaken the warning by discouraging only merge with /non-trivial/
uncommited changes.
I don't think documenting all the failure cases in the doc would be a
good idea, so I've left the in some cases part.
It's already documented in the pre-merge checks section, as Jonathan
Ramkumar Ramachandra artag...@gmail.com writes:
Matthieu Moy wrote:
Weaken the warning by discouraging only merge with /non-trivial/
uncommited changes.
I don't think documenting all the failure cases in the doc would be a
good idea, so I've left the in some cases part.
It's already
Matthieu Moy matthieu@grenoble-inp.fr writes:
Ramkumar Ramachandra artag...@gmail.com writes:
Matthieu Moy wrote:
Weaken the warning by discouraging only merge with /non-trivial/
uncommited changes.
I don't think documenting all the failure cases in the doc would be a
good idea, so
4 matches
Mail list logo
