Elijah Newren via GitGitGadget wrote: > From: Elijah Newren <newren@xxxxxxxxx> > > We have for some time shown a long warning when the user does not > specify how to reconcile divergent branches with git pull. Make it an > error now. Once again. We have not warned the users of this upcoming change a *single* day. We have not told them how to turn the new behavior, and how to keep the old behavior. If you want to guarantee user complaints, this is the way to do it. -- Felipe Contreras
