docs: Fix broken link in git-guide.md
docs: Fix broken link in git-guide.md

Update 'how to resolve a merge conflict' link because it is
broken, GitHub has change the link to the newer one.

dattatreya303/zulip,joyhchen/zulip,arpith/zulip,dhcrzf/zulip,aakash-cr7/zulip,AZtheAsian/zulip,j831/zulip,jackrzhang/zulip,vabs22/zulip,JPJPJPOPOP/zulip,jphilipsen05/zulip,jrowan/zulip,KingxBanana/zulip,cosmicAsymmetry/zulip,rishig/zulip,jainayush975/zulip,vabs22/zulip,mahim97/zulip,j831/zulip,blaze225/zulip,joyhchen/zulip,SmartPeople/zulip,jphilipsen05/zulip,jphilipsen05/zulip,showell/zulip,TigorC/zulip,hackerkid/zulip,rishig/zulip,dattatreya303/zulip,rht/zulip,dhcrzf/zulip,joyhchen/zulip,zulip/zulip,hackerkid/zulip,ryanbackman/zulip,PhilSk/zulip,KingxBanana/zulip,shubhamdhama/zulip,verma-varsha/zulip,rishig/zulip,punchagan/zulip,j831/zulip,sonali0901/zulip,sonali0901/zulip,dawran6/zulip,ryanbackman/zulip,showell/zulip,tommyip/zulip,susansls/zulip,AZtheAsian/zulip,punchagan/zulip,souravbadami/zulip,niftynei/zulip,rishig/zulip,Galexrt/zulip,kou/zulip,punchagan/zulip,rishig/zulip,amyliu345/zulip,tommyip/zulip,jackrzhang/zulip,rht/zulip,amyliu345/zulip,punchagan/zulip,hackerkid/zulip,andersk/zulip,aakash-cr7/zulip,zacps/zulip,isht3/zulip,blaze225/zulip,christi3k/zulip,jainayush975/zulip,mahim97/zulip,showell/zulip,amanharitsh123/zulip,dattatreya303/zulip,Juanvulcano/zulip,showell/zulip,dhcrzf/zulip,brockwhittaker/zulip,PhilSk/zulip,cosmicAsymmetry/zulip,blaze225/zulip,synicalsyntax/zulip,jrowan/zulip,arpith/zulip,ryanbackman/zulip,samatdav/zulip,Diptanshu8/zulip,amyliu345/zulip,kou/zulip,joyhchen/zulip,timabbott/zulip,blaze225/zulip,vabs22/zulip,isht3/zulip,SmartPeople/zulip,eeshangarg/zulip,zulip/zulip,JPJPJPOPOP/zulip,Galexrt/zulip,dawran6/zulip,brainwane/zulip,susansls/zulip,aakash-cr7/zulip,cosmicAsymmetry/zulip,joyhchen/zulip,jrowan/zulip,Juanvulcano/zulip,samatdav/zulip,Galexrt/zulip,dhcrzf/zulip,sharmaeklavya2/zulip,zulip/zulip,dattatreya303/zulip,andersk/zulip,ryanbackman/zulip,Juanvulcano/zulip,AZtheAsian/zulip,andersk/zulip,zulip/zulip,amyliu345/zulip,TigorC/zulip,jackrzhang/zulip,KingxBanana/zulip,dawran6/zulip,kou/zulip,kou/zulip,sharmaeklavya2/zulip,rht/zulip,synicalsyntax/zulip,arpith/zulip,Diptanshu8/zulip,verma-varsha/zulip,jackrzhang/zulip,PhilSk/zulip,vaidap/zulip,joyhchen/zulip,souravbadami/zulip,vaidap/zulip,AZtheAsian/zulip,punchagan/zulip,souravbadami/zulip,TigorC/zulip,tommyip/zulip,brockwhittaker/zulip,arpith/zulip,JPJPJPOPOP/zulip,amanharitsh123/zulip,souravbadami/zulip,andersk/zulip,hackerkid/zulip,zacps/zulip,TigorC/zulip,niftynei/zulip,synicalsyntax/zulip,Galexrt/zulip,vaidap/zulip,blaze225/zulip,cosmicAsymmetry/zulip,niftynei/zulip,mahim97/zulip,dhcrzf/zulip,isht3/zulip,verma-varsha/zulip,ryanbackman/zulip,punchagan/zulip,hackerkid/zulip,AZtheAsian/zulip,timabbott/zulip,dhcrzf/zulip,rht/zulip,vaidap/zulip,jackrzhang/zulip,aakash-cr7/zulip,SmartPeople/zulip,brockwhittaker/zulip,susansls/zulip,eeshangarg/zulip,andersk/zulip,samatdav/zulip,KingxBanana/zulip,hackerkid/zulip,zacps/zulip,shubhamdhama/zulip,andersk/zulip,JPJPJPOPOP/zulip,verma-varsha/zulip,JPJPJPOPOP/zulip,brainwane/zulip,amanharitsh123/zulip,niftynei/zulip,kou/zulip,zacps/zulip,Juanvulcano/zulip,j831/zulip,rht/zulip,jainayush975/zulip,rishig/zulip,vabs22/zulip,dhcrzf/zulip,andersk/zulip,vabs22/zulip,dattatreya303/zulip,shubhamdhama/zulip,vaidap/zulip,punchagan/zulip,samatdav/zulip,christi3k/zulip,jrowan/zulip,brockwhittaker/zulip,rht/zulip,eeshangarg/zulip,synicalsyntax/zulip,tommyip/zulip,AZtheAsian/zulip,shubhamdhama/zulip,souravbadami/zulip,zacps/zulip,susansls/zulip,amanharitsh123/zulip,jphilipsen05/zulip,synicalsyntax/zulip,TigorC/zulip,christi3k/zulip,dawran6/zulip,timabbott/zulip,j831/zulip,Galexrt/zulip,eeshangarg/zulip,amyliu345/zulip,shubhamdhama/zulip,christi3k/zulip,sonali0901/zulip,jackrzhang/zulip,showell/zulip,mahim97/zulip,Diptanshu8/zulip,PhilSk/zulip,Diptanshu8/zulip,isht3/zulip,showell/zulip,timabbott/zulip,Diptanshu8/zulip,ryanbackman/zulip,KingxBanana/zulip,aakash-cr7/zulip,JPJPJPOPOP/zulip,niftynei/zulip,SmartPeople/zulip,zulip/zulip,showell/zulip,jainayush975/zulip,Galexrt/zulip,zulip/zulip,tommyip/zulip,eeshangarg/zulip,jrowan/zulip,rishig/zulip,verma-varsha/zulip,tommyip/zulip,jainayush975/zulip,jphilipsen05/zulip,sharmaeklavya2/zulip,rht/zulip,amanharitsh123/zulip,susansls/zulip,brainwane/zulip,synicalsyntax/zulip,brockwhittaker/zulip,brainwane/zulip,sonali0901/zulip,dawran6/zulip,brainwane/zulip,sonali0901/zulip,isht3/zulip,PhilSk/zulip,susansls/zulip,christi3k/zulip,blaze225/zulip,jrowan/zulip,KingxBanana/zulip,PhilSk/zulip,samatdav/zulip,niftynei/zulip,timabbott/zulip,souravbadami/zulip,cosmicAsymmetry/zulip,cosmicAsymmetry/zulip,eeshangarg/zulip,jackrzhang/zulip,hackerkid/zulip,brockwhittaker/zulip,Galexrt/zulip,amanharitsh123/zulip,dawran6/zulip,sharmaeklavya2/zulip,SmartPeople/zulip,timabbott/zulip,mahim97/zulip,Juanvulcano/zulip,timabbott/zulip,tommyip/zulip,j831/zulip,brainwane/zulip,isht3/zulip,samatdav/zulip,sharmaeklavya2/zulip,brainwane/zulip,synicalsyntax/zulip,Diptanshu8/zulip,SmartPeople/zulip,mahim97/zulip,verma-varsha/zulip,arpith/zulip,jainayush975/zulip,dattatreya303/zulip,shubhamdhama/zulip,kou/zulip,vabs22/zulip,aakash-cr7/zulip,arpith/zulip,jphilipsen05/zulip,shubhamdhama/zulip,sonali0901/zulip,TigorC/zulip,eeshangarg/zulip,kou/zulip,christi3k/zulip,zulip/zulip,Juanvulcano/zulip,zacps/zulip,sharmaeklavya2/zulip,amyliu345/zulip,vaidap/zulip