Phil Hord <phil.h...@gmail.com> writes: > I agree that 'git reset --hard' should be mentioned in the hint for > newbies, but this conflicts with my desire to avoid giving chainsaws > to toddlers.
Exactly. So what are you suggesting? Perhaps force the user to go through a series of quiz when "git merge" was run by the user for the first time to make sure she at least read the sections on merges and conflict resolutions in the documentation to understand the fundamentals, and refuse to proceed until the user passes? I personally do not see a good way out. Even telling new users not to do merges, rebases, or resets but to only build a straight linear history is not a fix, as the user will never gain the necessary understanding by doing only limited and simple things. -- 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