Duy Nguyen <pclouds@xxxxxxxxx> writes: > Kinda. But "--force --merge" makes no sense. --force discards all > local changes by definition, which means you can't have conflicts and > will not need --merge. I think this is the reason why we die() out > when both are specified. So we need something like > --discard-staged-changes-only... At that point, I would have to say that we do not need anything. The use case is already covered with "git reset && git checkout -m", isn't it? Thanks.
