mklhmnn questions

• Git: after preparing a real merge commit, how to create a simple commit?
• Git: how to create different unmerged states?
• Git: can't undo local changes (error: path ... is unmerged)

mklhmnn answers