update: better handle merge conflicts.
update: better handle merge conflicts.

When there are merge conflicts we fail pretty hard. This is still
possible after this commit but at least we've given Git enough pointers
to make it less likely.

Closes Homebrew/homebrew#49299.

Signed-off-by: Mike McQuaid <a17fed27eaa842282862ff7c1b9c8395a26ac320@mikemcquaid.com>

mgrimes/brew,amar-laksh/brew_sudo,AnastasiaSulyagina/brew,jmsundar/brew,claui/brew,JCount/brew,maxim-belkin/brew,hanxue/linuxbrew,gregory-nisbet/brew,nandub/brew,JCount/brew,claui/brew,ilovezfs/brew,muellermartin/dist,konqui/brew,amar-laksh/brew_sudo,MikeMcQuaid/brew,DomT4/brew,toonetown/homebrew,staticfloat/brew,hanxue/linuxbrew,zmwangx/brew,bfontaine/brew,Homebrew/brew,DomT4/brew,gordonmcshane/homebrew,rwhogg/brew,EricFromCanada/brew,toonetown/homebrew,muellermartin/dist,vitorgalvao/brew,MikeMcQuaid/brew,Linuxbrew/brew,Homebrew/brew,maxim-belkin/brew,alyssais/brew,sjackman/homebrew,mistydemeo/homebrew,mahori/brew,reelsense/brew,zmwangx/brew,sjackman/homebrew,mgrimes/brew,nandub/brew,alyssais/brew,toonetown/homebrew,staticfloat/brew,MikeMcQuaid/brew,konqui/brew,vitorgalvao/brew,bfontaine/brew,claui/brew,staticfloat/brew,mahori/brew,nandub/brew,pseudocody/brew,pseudocody/brew,MikeMcQuaid/brew,nandub/brew,jmsundar/brew,gordonmcshane/homebrew,sjackman/homebrew,Linuxbrew/brew,tonyg/homebrew,reitermarkus/brew,reitermarkus/brew,vitorgalvao/brew,amar-laksh/brew_sudo,JCount/brew,gordonmcshane/homebrew,rwhogg/brew,mistydemeo/homebrew,gregory-nisbet/brew,rwhogg/brew,zmwangx/brew,palxex/brew,ilovezfs/brew,muellermartin/dist,DomT4/brew,aw1621107/brew,JCount/brew,jmsundar/brew,Linuxbrew/brew,tonyg/homebrew,konqui/brew,AnastasiaSulyagina/brew,maxim-belkin/brew,mahori/brew,sjackman/homebrew,tonyg/homebrew,EricFromCanada/brew,AnastasiaSulyagina/brew,Linuxbrew/brew,gregory-nisbet/brew,alyssais/brew,aw1621107/brew,reitermarkus/brew,reitermarkus/brew,ilovezfs/brew,pseudocody/brew,reelsense/brew,mahori/brew,EricFromCanada/brew,palxex/brew,EricFromCanada/brew,mistydemeo/homebrew,hanxue/linuxbrew,Homebrew/brew,Homebrew/brew,aw1621107/brew,DomT4/brew,reelsense/brew,mgrimes/brew,claui/brew,vitorgalvao/brew,bfontaine/brew,palxex/brew,konqui/brew