Running git-merge(1) on a dirty worktree might cause data loss [1,2], so after cleaning up some redundant code, warn before starting a merge.
BTW, patch #3 causes a trivial merge conflict in "magit-key-mode.el" when combined with the 'cleanup' series [3]. See pull request #758 [4]. [1] mid:"calkwk0k6pvsjgahj4k2hkgwdgudf0j-0d+dvxk+ve7x4jhs...@mail.gmail.com" [2] https://github.com/praet/magit/commit/e3328625#commitcomment-3798188 [3] https://github.com/magit/magit/pull/748 [4] https://github.com/magit/magit/pull/758 Pieter Praet (4): `magit-merge': correct docstring `magit-automatic-merge': remove `magit-merge': absorb `magit-manual-merge' `magit-merge': warn before starting merge in a dirty worktree magit-key-mode.el | 2 +- magit.el | 39 +++++++++++++++++++-------------------- 2 files changed, 20 insertions(+), 21 deletions(-) -- 1.7.11.1 -- --- You received this message because you are subscribed to the Google Groups "magit" group. To unsubscribe from this group and stop receiving emails from it, send an email to [email protected]. For more options, visit https://groups.google.com/groups/opt_out.
