How to resolve conflict in merge request in gitlab? - Stack ...

Gitlab is right. What you're doing here by resolving conflicts, is merging master in 156 . First step before merging 156 in master is to ... Home Public Questions Tags Users Companies Collectives ExploreCollectives Teams StackOverflowforTeams –Startcollaboratingandsharingorganizationalknowledge. CreateafreeTeam WhyTeams? Teams CreatefreeTeam Collectives™onStackOverflow Findcentralized,trustedcontentandcollaboratearoundthetechnologiesyouusemost. Learnmore Teams Q&Aforwork Connectandshareknowledgewithinasinglelocationthatisstructuredandeasytosearch. Learnmore Howtoresolveconflictinmergerequestingitlab? AskQuestion Asked 9monthsago Modified 9monthsago Viewed 3ktimes 4 1 I'vegotamergerequestingitlab: Ihaveapprovedthisrequest--itlooksgood.Iwanttomergewithmaster. WhenIgoto"ResolveConflicts"Igetthefollowing: Note,specifically,inthedefaultcommitmessage,itappearstobetryingtomerge'master'into'156'.ThisistheoppositeofwhatIwant--Iwanttomergethesethingsintomaster. EvenifIsoliderforwardanddothemergebypickingone(andI'mnotsurewhichisrightbecauseit'snotclearwhatis'mine'vs'ours'...I'mreturnedbacktothegitlabmergerequestpageandtoldtherearestillconflicts-butnownowbuttontodoitingitlab,onlylocally: WhatamIdoingincorrectly?Istherenomethodtomergeviagitlab-doIhavetodothemergelocallyandthenpushit? gitgitlab Share Improvethisquestion Follow askedAug23,2021at20:36 lowcrawlerlowcrawler 5,66477goldbadges3434silverbadges5252bronzebadges Addacomment  |  1Answer 1 Sortedby: Resettodefault Highestscore(default) Datemodified(newestfirst) Datecreated(oldestfirst) 2 Gitlabisright.Whatyou'redoingherebyresolvingconflicts,ismergingmasterin156. Firststepbeforemerging156inmasteristohaveacleantreestatebetweenthetwobranches,whichmeansthatallchangesmadeonmastershouldbereflectedin156first.Soyeah,youneedtomergemasterin156beforemerging156inmaster. Thiswayofresolvingconflictsforcesyoutohavethatannoyingcommitmessage.WhatI'dsuggesthereisrebasing156onmaster,whichissomethingyoucannotachieveonGitlabGUI.Notethatthiswouldpotentiallyoverride156'shistorywithmaster's,butthat'swhatyouneedayway. #onbranch156 gitfetch gitrebaseorigin/master gitpush-forigin156 Note:whenrebasing156onmaster,ourswouldbemasterandtheirswouldbe156. Share Improvethisanswer Follow editedAug23,2021at20:51 answeredAug23,2021at20:45 ValBertheValBerthe 1,65111goldbadge1616silverbadges3333bronzebadges 2 Intheoriginalmergerequest->resolveconflicts...is156'ours'orisit'theirs'? – lowcrawler Aug23,2021at20:57 Itisjustwrittenintheanswer:) – ValBerthe Aug23,2021at20:57 Addacomment  |  YourAnswer ThanksforcontributingananswertoStackOverflow!Pleasebesuretoanswerthequestion.Providedetailsandshareyourresearch!Butavoid…Askingforhelp,clarification,orrespondingtootheranswers.Makingstatementsbasedonopinion;backthemupwithreferencesorpersonalexperience.Tolearnmore,seeourtipsonwritinggreatanswers. Draftsaved Draftdiscarded Signuporlogin SignupusingGoogle SignupusingFacebook SignupusingEmailandPassword Submit Postasaguest Name Email Required,butnevershown PostYourAnswer Discard Byclicking“PostYourAnswer”,youagreetoourtermsofservice,privacypolicyandcookiepolicy Nottheansweryou'relookingfor?Browseotherquestionstaggedgitgitlaboraskyourownquestion. GitLab Collective LearnmoreaboutCollectivesonStackOverflow TheOverflowBlog HowaveryaverageprogrammerbecameGitHub’sCTO(Ep.447) Talkingblockchain,functionalprogramming,andthefuturewithTezos... FeaturedonMeta AnnouncingthearrivalofValuedAssociate#1214:Dalmarus Improvementstositestatusandincidentcommunication StagingGround:ReviewerMotivation,Scaling,andOpenQuestions CollectivesUpdate:IntroducingBulletins RetiringOurCommunity-SpecificClosureReasonsforServerFaultandSuperUser The[social]tagisintheprocessofbeingburninated Related 3008 Iranintoamergeconflict.HowcanIabortthemerge? 5197 HowdoIresolvemergeconflictsinaGitrepository? 10497 HowdoIundo'gitadd'beforecommit? 24336 HowdoIundothemostrecentlocalcommitsinGit? 19210 HowdoIdeleteaGitbranchlocallyandremotely? 4577 UndoaGitmergethathasn'tbeenpushedyet 2494 Whatisthebest(andsafest)waytomergeaGitbranchintomaster? 1695 HowcanIreconciledetachedHEADwithmaster/origin? 10436 HowdoIrenamealocalGitbranch? 1785 Removetrackingbranchesnolongeronremote HotNetworkQuestions WhatarethequizquestionsinMonstersUniversity? CanCycleCameraEvidencebeUsedbyPolicetoEnforceDangerousMotorists? ReadOnlyqueriesonsecondaryserverdonotreturncorrectvalues Right-Turn-OnlyMaze BookwithanEgyptianhunchbackdemi-god HowcanIrecreatethis"balloon"anddistributeobjectsrandomlyandalsoresizethemrandomly,likeinthepicture? MariaDb-Howtoensurea(LEFT)JOINonlyifasinglerightsiderecordexists Locatingitemsinspacedriftingtogether Whatisthiselongatedplasticandmetalutensil? Acapacitorchargetime-twomethodstwodifferentanswers AhobogoestovisitafuneralintheAmericansouth,andprovestobeanalien Otherthanmatchandrope,isthereanyotherwaytofirewhatisessentiallyamusket/cannon? EntrytoTheCIAPart#1 RapidResponseCOVID-19AntigenTest:Whatcanbeassumedbythecontrolbar? Whyisit"your"andnot"yours"in"toseeyouronAmazonaccountactivity" Whyaretherethreeverbsinarow? Asaneditor,whattodowhenarefereerecommendscitingtheirownpapers? GunturretforaStarWarsship? AtJohn5:18,didJesusbreaktheSabbath? MovieorTVepisodewherescientistsgothroughasuccessivelylessandlessprobablesetofcircumstancestofinallymakefirstcontact Whichplaceinthecariscoolestonhotsunnydays? Statutoryrighttoreturnshoesboughtonlinethatdon'tfit Sizeofintegralsymbolinsectionheaderwithmlmodern Torquewrenchnotclickinganticlockwise morehotquestions Questionfeed SubscribetoRSS Questionfeed TosubscribetothisRSSfeed,copyandpastethisURLintoyourRSSreader. Yourprivacy Byclicking“Acceptallcookies”,youagreeStackExchangecanstorecookiesonyourdeviceanddiscloseinformationinaccordancewithourCookiePolicy. Acceptallcookies Customizesettings