乙酸鋰 <ch3co...@gmail.com> writes:
> I would like to suggest 2 merge options
> --dictator use all my changes
> --humble use all their changes
> These allows to produce a fast-forward commit, without resolving any
> Sometimes, someone did something completely wrong, so the commit needs
> to be ignored.
> I cannot tell everyone in the world to run git fetch followed by git
> reset --hard.
Then you cannot tell them to use "pull --humble" either, can you?
Not seeing any merit in the proposal (yet).
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html