git-merge Documentation - Git

The second syntax (" git merge --abort ") can only be run after the merge has resulted in conflicts. git merge --abort will abort the merge process and try ... About BranchingandMerging SmallandFast Distributed DataAssurance StagingArea FreeandOpenSource Trademark Documentation Reference Book Videos ExternalLinks Downloads GUIClients Logos Community English▾ English Français Português(Brasil) Topics▾ SetupandConfig git config help bugreport GettingandCreatingProjects init clone BasicSnapshotting add status diff commit notes restore reset rm mv BranchingandMerging branch checkout switch merge mergetool log stash tag worktree SharingandUpdatingProjects fetch pull push remote submodule InspectionandComparison show log diff difftool range-diff shortlog describe Patching apply cherry-pick diff rebase revert Debugging bisect blame grep Email am apply format-patch send-email request-pull ExternalSystems svn fast-import ServerAdmin daemon update-server-info Guides gitattributes Command-lineinterfaceconventions EverydayGit FrequentlyAskedQuestions(FAQ) Glossary Hooks gitignore gitmodules Revisions Submodules Tutorial Workflows Allguides... Administration clean gc fsck reflog filter-branch instaweb archive bundle PlumbingCommands cat-file check-ignore checkout-index commit-tree count-objects diff-index for-each-ref hash-object ls-files ls-tree merge-base read-tree rev-list rev-parse show-ref symbolic-ref update-index update-ref verify-pack write-tree Version2.37.2 ▾ git-mergelastupdatedin2.37.2 2.35.1→2.37.2nochanges 2.35.0 01/24/22 2.34.1→2.34.4nochanges 2.34.0 11/15/21 2.33.2→2.33.4nochanges 2.33.1 10/12/21 2.33.0 08/16/21 2.30.1→2.32.3nochanges 2.30.0 12/27/20 2.29.1→2.29.3nochanges 2.29.0 10/19/20 2.27.1→2.28.1nochanges 2.27.0 06/01/20 2.25.1→2.26.3nochanges 2.25.0 01/13/20 2.24.1→2.24.4nochanges 2.24.0 11/04/19 2.23.1→2.23.4nochanges 2.23.0 08/16/19 2.22.2→2.22.5nochanges 2.22.1 08/11/19 2.22.0 06/07/19 2.20.1→2.21.4nochanges 2.20.0 12/09/18 2.19.1→2.19.6nochanges 2.19.0 09/10/18 2.18.1→2.18.5nochanges 2.18.0 06/21/18   NAME git-merge-Jointwoormoredevelopmenthistoriestogether SYNOPSIS gitmerge[-n][--stat][--no-commit][--squash][--[no-]edit] [--no-verify][-s][-X][-S[]] [--[no-]allow-unrelated-histories] [--[no-]rerere-autoupdate][-m][-F] [--into-name][…​] gitmerge(--continue|--abort|--quit) DESCRIPTION Incorporateschangesfromthenamedcommits(sincethetimetheir historiesdivergedfromthecurrentbranch)intothecurrent branch.Thiscommandisusedbygitpulltoincorporatechanges fromanotherrepositoryandcanbeusedbyhandtomergechanges fromonebranchintoanother. Assumethefollowinghistoryexistsandthecurrentbranchis "master": A---B---Ctopic / D---E---F---Gmaster Then"gitmergetopic"willreplaythechangesmadeonthe topicbranchsinceitdivergedfrommaster(i.e.,E)until itscurrentcommit(C)ontopofmaster,andrecordtheresult inanewcommitalongwiththenamesofthetwoparentcommitsand alogmessagefromtheuserdescribingthechanges. A---B---Ctopic /\ D---E---F---G---Hmaster Thesecondsyntax("gitmerge--abort")canonlyberunafterthe mergehasresultedinconflicts.gitmerge--abortwillabortthe mergeprocessandtrytoreconstructthepre-mergestate.However, iftherewereuncommittedchangeswhenthemergestarted(and especiallyifthosechangeswerefurthermodifiedafterthemerge wasstarted),gitmerge--abortwillinsomecasesbeunableto reconstructtheoriginal(pre-merge)changes.Therefore: Warning:Runninggitmergewithnon-trivialuncommittedchangesis discouraged:whilepossible,itmayleaveyouinastatethatishardto backoutofinthecaseofaconflict. Thethirdsyntax("gitmerge--continue")canonlyberunafterthe mergehasresultedinconflicts. OPTIONS --commit --no-commit Performthemergeandcommittheresult.Thisoptioncan beusedtooverride--no-commit. With--no-commitperformthemergeandstopjustbeforecreating amergecommit,togivetheuserachancetoinspectandfurther tweakthemergeresultbeforecommitting. Notethatfast-forwardupdatesdonotcreateamergecommitand thereforethereisnowaytostopthosemergeswith--no-commit. Thus,ifyouwanttoensureyourbranchisnotchangedorupdated bythemergecommand,use--no-ffwith--no-commit. --edit -e --no-edit Invokeaneditorbeforecommittingsuccessfulmechanicalmergeto furtheredittheauto-generatedmergemessage,sothattheuser canexplainandjustifythemerge.The--no-editoptioncanbe usedtoaccepttheauto-generatedmessage(thisisgenerally discouraged). The--edit(or-e)optionisstillusefulifyouare givingadraftmessagewiththe-moptionfromthecommandline andwanttoedititintheeditor. Olderscriptsmaydependonthehistoricalbehaviourofnotallowingthe usertoeditthemergelogmessage.Theywillseeaneditoropenedwhen theyrungitmerge.Tomakeiteasiertoadjustsuchscriptstothe updatedbehaviour,theenvironmentvariableGIT_MERGE_AUTOEDITcanbe settonoatthebeginningofthem. --cleanup= Thisoptiondetermineshowthemergemessagewillbecleanedupbefore committing.Seegit-commit[1]formoredetails.Inaddition,if theisgivenavalueofscissors,scissorswillbeappended toMERGE_MSGbeforebeingpassedontothecommitmachineryinthe caseofamergeconflict. --ff --no-ff --ff-only Specifieshowamergeishandledwhenthemerged-inhistoryis alreadyadescendantofthecurrenthistory.--ffisthe defaultunlessmerginganannotated(andpossiblysigned)tag thatisnotstoredinitsnaturalplaceintherefs/tags/ hierarchy,inwhichcase--no-ffisassumed. With--ff,whenpossibleresolvethemergeasafast-forward(only updatethebranchpointertomatchthemergedbranch;donotcreatea mergecommit).Whennotpossible(whenthemerged-inhistoryisnota descendantofthecurrenthistory),createamergecommit. With--no-ff,createamergecommitinallcases,evenwhenthemerge couldinsteadberesolvedasafast-forward. With--ff-only,resolvethemergeasafast-forwardwhenpossible. Whennotpossible,refusetomergeandexitwithanon-zerostatus. -S[] --gpg-sign[=] --no-gpg-sign GPG-signtheresultingmergecommit.Thekeyidargumentis optionalanddefaultstothecommitteridentity;ifspecified, itmustbestucktotheoptionwithoutaspace.--no-gpg-sign isusefultocountermandbothcommit.gpgSignconfigurationvariable, andearlier--gpg-sign. --log[=] --no-log Inadditiontobranchnames,populatethelogmessagewith one-linedescriptionsfromatmostactualcommitsthatarebeing merged.Seealsogit-fmt-merge-msg[1]. With--no-logdonotlistone-linedescriptionsfromthe actualcommitsbeingmerged. --signoff --no-signoff AddaSigned-off-bytrailerbythecommitterattheendofthecommit logmessage.Themeaningofasignoffdependsontheproject towhichyou’recommitting.Forexample,itmaycertifythat thecommitterhastherightstosubmittheworkunderthe project’slicenseoragreestosomecontributorrepresentation, suchasaDeveloperCertificateofOrigin. (Seehttp://developercertificate.orgfortheoneusedbythe LinuxkernelandGitprojects.)Consultthedocumentationor leadershipoftheprojecttowhichyou’recontributingto understandhowthesignoffsareusedinthatproject. The--no-signoffoptioncanbeusedtocountermandanearlier--signoff optiononthecommandline. --stat -n --no-stat Showadiffstatattheendofthemerge.Thediffstatisalso controlledbytheconfigurationoptionmerge.stat. With-nor--no-statdonotshowadiffstatattheendofthe merge. --squash --no-squash Producetheworkingtreeandindexstateasifarealmerge happened(exceptforthemergeinformation),butdonotactually makeacommit,movetheHEAD,orrecord$GIT_DIR/MERGE_HEAD (tocausethenextgitcommitcommandtocreateamerge commit).Thisallowsyoutocreateasinglecommitontopof thecurrentbranchwhoseeffectisthesameasmerginganother branch(ormoreincaseofanoctopus). With--no-squashperformthemergeandcommittheresult.This optioncanbeusedtooverride--squash. With--squash,--commitisnotallowed,andwillfail. --[no-]verify Bydefault,thepre-mergeandcommit-msghooksarerun. When--no-verifyisgiven,thesearebypassed. Seealsogithooks[5]. -s --strategy= Usethegivenmergestrategy;canbesuppliedmorethan oncetospecifythemintheordertheyshouldbetried. Ifthereisno-soption,abuilt-inlistofstrategies isusedinstead(ortwhenmergingasinglehead, octopusotherwise). -X --strategy-option= Passmergestrategyspecificoptionthroughtothemerge strategy. --verify-signatures --no-verify-signatures Verifythatthetipcommitofthesidebranchbeingmergedis signedwithavalidkey,i.e.akeythathasavaliduid:inthe defaulttrustmodel,thismeansthesigningkeyhasbeensignedby atrustedkey.Ifthetipcommitofthesidebranchisnotsigned withavalidkey,themergeisaborted. --summary --no-summary Synonymsto--statand--no-stat;thesearedeprecatedandwillbe removedinthefuture. -q --quiet Operatequietly.Implies--no-progress. -v --verbose Beverbose. --progress --no-progress Turnprogresson/offexplicitly.Ifneitherisspecified, progressisshownifstandarderrorisconnectedtoaterminal. Notethatnotallmergestrategiesmaysupportprogress reporting. --autostash --no-autostash Automaticallycreateatemporarystashentrybeforetheoperation begins,recorditinthespecialrefMERGE_AUTOSTASH andapplyitaftertheoperationends.Thismeans thatyoucanruntheoperationonadirtyworktree.However,use withcare:thefinalstashapplicationafterasuccessful mergemightresultinnon-trivialconflicts. --allow-unrelated-histories Bydefault,gitmergecommandrefusestomergehistories thatdonotshareacommonancestor.Thisoptioncanbe usedtooverridethissafetywhenmerginghistoriesoftwo projectsthatstartedtheirlivesindependently.Asthatis averyrareoccasion,noconfigurationvariabletoenable thisbydefaultexistsandwillnotbeadded. -m Setthecommitmessagetobeusedforthemergecommit(in caseoneiscreated). If--logisspecified,ashortlogofthecommitsbeingmerged willbeappendedtothespecifiedmessage. Thegitfmt-merge-msgcommandcanbe usedtogiveagooddefaultforautomatedgitmerge invocations.Theautomatedmessagecanincludethebranchdescription. --into-name Preparethedefaultmergemessageasifmergingtothebranch ,insteadofthenameoftherealbranchtowhich themergeismade. -F --file= Readthecommitmessagetobeusedforthemergecommit(in caseoneiscreated). If--logisspecified,ashortlogofthecommitsbeingmerged willbeappendedtothespecifiedmessage. --rerere-autoupdate --no-rerere-autoupdate Allowtherereremechanismtoupdatetheindexwiththe resultofauto-conflictresolutionifpossible. --overwrite-ignore --no-overwrite-ignore Silentlyoverwriteignoredfilesfromthemergeresult.This isthedefaultbehavior.Use--no-overwrite-ignoretoabort. --abort Abortthecurrentconflictresolutionprocess,and trytoreconstructthepre-mergestate.Ifanautostashentryis present,applyittotheworktree. Iftherewereuncommittedworktreechangespresentwhenthemerge started,gitmerge--abortwillinsomecasesbeunableto reconstructthesechanges.Itisthereforerecommendedtoalways commitorstashyourchangesbeforerunninggitmerge. gitmerge--abortisequivalenttogitreset--mergewhen MERGE_HEADispresentunlessMERGE_AUTOSTASHisalsopresentin whichcasegitmerge--abortappliesthestashentrytotheworktree whereasgitreset--mergewillsavethestashedchangesinthestash list. --quit Forgetaboutthecurrentmergeinprogress.Leavetheindex andtheworkingtreeas-is.IfMERGE_AUTOSTASHispresent,the stashentrywillbesavedtothestashlist. --continue Afteragitmergestopsduetoconflictsyoucanconcludethe mergebyrunninggitmerge--continue(see"HOWTORESOLVE CONFLICTS"sectionbelow). …​ Commits,usuallyotherbranchheads,tomergeintoourbranch. Specifyingmorethanonecommitwillcreateamergewith morethantwoparents(affectionatelycalledanOctopusmerge). Ifnocommitisgivenfromthecommandline,mergetheremote-tracking branchesthatthecurrentbranchisconfiguredtouseasitsupstream. Seealsotheconfigurationsectionofthismanualpage. WhenFETCH_HEAD(andnoothercommit)isspecified,thebranches recordedinthe.git/FETCH_HEADfilebythepreviousinvocation ofgitfetchformergingaremergedtothecurrentbranch. PRE-MERGECHECKS Beforeapplyingoutsidechanges,youshouldgetyourownworkin goodshapeandcommittedlocally,soitwillnotbeclobberedif thereareconflicts.Seealsogit-stash[1]. gitpullandgitmergewillstopwithoutdoinganythingwhen localuncommittedchangesoverlapwithfilesthatgitpull/git mergemayneedtoupdate. Toavoidrecordingunrelatedchangesinthemergecommit, gitpullandgitmergewillalsoabortifthereareanychanges registeredintheindexrelativetotheHEADcommit.(Special narrowexceptionstothisrulemayexistdependingonwhichmerge strategyisinuse,butgenerally,theindexmustmatchHEAD.) IfallnamedcommitsarealreadyancestorsofHEAD,gitmerge willexitearlywiththemessage"Alreadyuptodate." FAST-FORWARDMERGE Oftenthecurrentbranchheadisanancestorofthenamedcommit. Thisisthemostcommoncaseespeciallywheninvokedfromgit pull:youaretrackinganupstreamrepository,youhavecommitted nolocalchanges,andnowyouwanttoupdatetoanewerupstream revision.Inthiscase,anewcommitisnotneededtostorethe combinedhistory;instead,theHEAD(alongwiththeindex)is updatedtopointatthenamedcommit,withoutcreatinganextra mergecommit. Thisbehaviorcanbesuppressedwiththe--no-ffoption. TRUEMERGE Exceptinafast-forwardmerge(seeabove),thebranchestobe mergedmustbetiedtogetherbyamergecommitthathasbothofthem asitsparents. Amergedversionreconcilingthechangesfromallbranchestobe mergediscommitted,andyourHEAD,index,andworkingtreeare updatedtoit.Itispossibletohavemodificationsintheworking treeaslongastheydonotoverlap;theupdatewillpreservethem. Whenitisnotobvioushowtoreconcilethechanges,thefollowing happens: TheHEADpointerstaysthesame. TheMERGE_HEADrefissettopointtotheotherbranchhead. Pathsthatmergedcleanlyareupdatedbothintheindexfileand inyourworkingtree. Forconflictingpaths,theindexfilerecordsuptothree versions:stage1storestheversionfromthecommonancestor, stage2fromHEAD,andstage3fromMERGE_HEAD(you caninspectthestageswithgitls-files-u).Theworking treefilescontaintheresultofthe"merge"program;i.e.3-way mergeresultswithfamiliarconflictmarkers<<<===>>>. Nootherchangesaremade.Inparticular,thelocal modificationsyouhadbeforeyoustartedmergewillstaythe sameandtheindexentriesforthemstayastheywere, i.e.matchingHEAD. Ifyoutriedamergewhichresultedincomplexconflictsand wanttostartover,youcanrecoverwithgitmerge--abort. MERGINGTAG Whenmerginganannotated(andpossiblysigned)tag,Gitalways createsamergecommitevenifafast-forwardmergeispossible,and thecommitmessagetemplateispreparedwiththetagmessage. Additionally,ifthetagissigned,thesignaturecheckisreported asacommentinthemessagetemplate.Seealsogit-tag[1]. Whenyouwanttojustintegratewiththeworkleadingtothecommit thathappenstobetagged,e.g.synchronizingwithanupstream releasepoint,youmaynotwanttomakeanunnecessarymergecommit. Insuchacase,youcan"unwrap"thetagyourselfbeforefeedingit togitmerge,orpass--ff-onlywhenyoudonothaveanyworkon yourown.e.g. gitfetchorigin gitmergev1.2.3^0 gitmerge--ff-onlyv1.2.3 HOWCONFLICTSAREPRESENTED Duringamerge,theworkingtreefilesareupdatedtoreflecttheresult ofthemerge.Amongthechangesmadetothecommonancestor’sversion, non-overlappingones(thatis,youchangedanareaofthefilewhilethe othersideleftthatareaintact,orviceversa)areincorporatedinthe finalresultverbatim.Whenbothsidesmadechangestothesamearea, however,Gitcannotrandomlypickonesideovertheother,andasksyouto resolveitbyleavingwhatbothsidesdidtothatarea. Bydefault,Gitusesthesamestyleastheoneusedbythe"merge"program fromtheRCSsuitetopresentsuchaconflictedhunk,likethis: Herearelinesthatareeitherunchangedfromthecommon ancestor,orcleanlyresolvedbecauseonlyonesidechanged, orcleanlyresolvedbecausebothsideschangedthesameway. <<<<<<>>>>>>theirs:sample.txt Andhereisanotherlinethatiscleanlyresolvedorunmodified. Theareawhereapairofconflictingchangeshappenedismarkedwithmarkers <<<<<<>>>>>>.Thepartbeforethe======= istypicallyyourside,andthepartafterwardsistypicallytheirside. Thedefaultformatdoesnotshowwhattheoriginalsaidintheconflicting area.Youcannottellhowmanylinesaredeletedandreplacedwith Barbie’sremarkonyourside.Theonlythingyoucantellisthatyour sidewantstosayitishardandyou’dprefertogoshopping,whilethe othersidewantstoclaimitiseasy. Analternativestylecanbeusedbysettingthe"merge.conflictStyle" configurationvariabletoeither"diff3"or"zdiff3".In"diff3" style,theaboveconflictmaylooklikethis: Herearelinesthatareeitherunchangedfromthecommon ancestor,orcleanlyresolvedbecauseonlyonesidechanged, <<<<<<>>>>>>theirs:sample.txt Andhereisanotherlinethatiscleanlyresolvedorunmodified. whilein"zdiff3"style,itmaylooklikethis: Herearelinesthatareeitherunchangedfromthecommon ancestor,orcleanlyresolvedbecauseonlyonesidechanged, orcleanlyresolvedbecausebothsideschangedthesameway. <<<<<<>>>>>>theirs:sample.txt Andhereisanotherlinethatiscleanlyresolvedorunmodified. Inadditiontothe<<<<<<>>>>>>markers,ituses another|||||||markerthatisfollowedbytheoriginaltext.Youcan tellthattheoriginaljuststatedafact,andyoursidesimplygaveinto thatstatementandgaveup,whiletheothersidetriedtohaveamore positiveattitude.Youcansometimescomeupwithabetterresolutionby viewingtheoriginal. HOWTORESOLVECONFLICTS Afterseeingaconflict,youcandotwothings: Decidenottomerge.Theonlyclean-upsyouneedaretoreset theindexfiletotheHEADcommittoreverse2.andtoclean upworkingtreechangesmadeby2.and3.;gitmerge--abort canbeusedforthis. Resolvetheconflicts.Gitwillmarktheconflictsin theworkingtree.Editthefilesintoshapeand gitaddthemtotheindex.Usegitcommitor gitmerge--continuetosealthedeal.Thelattercommand checkswhetherthereisa(interrupted)mergeinprogress beforecallinggitcommit. Youcanworkthroughtheconflictwithanumberoftools: Useamergetool.gitmergetooltolaunchagraphical mergetoolwhichwillworkyouthroughthemerge. Lookatthediffs.gitdiffwillshowathree-waydiff, highlightingchangesfromboththeHEADandMERGE_HEAD versions. Lookatthediffsfromeachbranch.gitlog--merge-p willshowdiffsfirstfortheHEADversionandthenthe MERGE_HEADversion. Lookattheoriginals.gitshow:1:filenameshowsthe commonancestor,gitshow:2:filenameshowstheHEAD version,andgitshow:3:filenameshowstheMERGE_HEAD version. EXAMPLES Mergebranchesfixesandenhancementsontopof thecurrentbranch,makinganoctopusmerge: $gitmergefixesenhancements Mergebranchobsoleteintothecurrentbranch,usingours mergestrategy: $gitmerge-soursobsolete Mergebranchmaintintothecurrentbranch,butdonotmake anewcommitautomatically: $gitmerge--no-commitmaint Thiscanbeusedwhenyouwanttoincludefurtherchangestothe merge,orwanttowriteyourownmergecommitmessage. Youshouldrefrainfromabusingthisoptiontosneaksubstantial changesintoamergecommit.Smallfixupslikebumping release/versionnamewouldbeacceptable. MERGESTRATEGIES Themergemechanism(gitmergeandgitpullcommands)allowsthe backendmergestrategiestobechosenwith-soption.Somestrategies canalsotaketheirownoptions,whichcanbepassedbygiving-X argumentstogitmergeand/orgitpull. ort Thisisthedefaultmergestrategywhenpullingormergingone branch.Thisstrategycanonlyresolvetwoheadsusinga 3-waymergealgorithm.Whenthereismorethanonecommon ancestorthatcanbeusedfor3-waymerge,itcreatesamerged treeofthecommonancestorsandusesthatasthereference treeforthe3-waymerge.Thishasbeenreportedtoresultin fewermergeconflictswithoutcausingmismergesbytestsdone onactualmergecommitstakenfromLinux2.6kernel developmenthistory.Additionallythisstrategycandetect andhandlemergesinvolvingrenames.Itdoesnotmakeuseof detectedcopies.Thenameforthisalgorithmisanacronym ("OstensiblyRecursive’sTwin")andcamefromthefactthatit waswrittenasareplacementforthepreviousdefault algorithm,recursive. Theortstrategycantakethefollowingoptions: ours Thisoptionforcesconflictinghunkstobeauto-resolvedcleanlyby favoringourversion.Changesfromtheothertreethatdonot conflictwithoursidearereflectedinthemergeresult. Forabinaryfile,theentirecontentsaretakenfromourside. Thisshouldnotbeconfusedwiththeoursmergestrategy,whichdoesnot evenlookatwhattheothertreecontainsatall.Itdiscardseverything theothertreedid,declaringourhistorycontainsallthathappenedinit. theirs Thisistheoppositeofours;notethat,unlikeours,thereis notheirsmergestrategytoconfusethismergeoptionwith. ignore-space-change ignore-all-space ignore-space-at-eol ignore-cr-at-eol Treatslineswiththeindicatedtypeofwhitespacechangeas unchangedforthesakeofathree-waymerge.Whitespace changesmixedwithotherchangestoalinearenotignored. Seealsogit-diff[1]-b,-w, --ignore-space-at-eol,and--ignore-cr-at-eol. Iftheirversiononlyintroduceswhitespacechangestoaline, ourversionisused; Ifourversionintroduceswhitespacechangesbuttheir versionincludesasubstantialchange,theirversionisused; Otherwise,themergeproceedsintheusualway. renormalize Thisrunsavirtualcheck-outandcheck-inofallthreestages ofafilewhenresolvingathree-waymerge.Thisoptionis meanttobeusedwhenmergingbrancheswithdifferentclean filtersorend-of-linenormalizationrules.See"Merging brancheswithdifferingcheckin/checkoutattributes"in gitattributes[5]fordetails. no-renormalize Disablestherenormalizeoption.Thisoverridesthe merge.renormalizeconfigurationvariable. find-renames[=] Turnonrenamedetection,optionallysettingthesimilarity threshold.Thisisthedefault.Thisoverridesthe merge.renamesconfigurationvariable. Seealsogit-diff[1]--find-renames. rename-threshold= Deprecatedsynonymforfind-renames=. subtree[=] Thisoptionisamoreadvancedformofsubtreestrategy,where thestrategymakesaguessonhowtwotreesmustbeshiftedto matchwitheachotherwhenmerging.Instead,thespecifiedpath isprefixed(orstrippedfromthebeginning)tomaketheshapeof twotreestomatch. recursive Thiscanonlyresolvetwoheadsusinga3-waymerge algorithm.Whenthereismorethanonecommon ancestorthatcanbeusedfor3-waymerge,itcreatesa mergedtreeofthecommonancestorsandusesthatas thereferencetreeforthe3-waymerge.Thishasbeen reportedtoresultinfewermergeconflictswithout causingmismergesbytestsdoneonactualmergecommits takenfromLinux2.6kerneldevelopmenthistory. Additionallythiscandetectandhandlemergesinvolving renames.Itdoesnotmakeuseofdetectedcopies.Thiswas thedefaultstrategyforresolvingtwoheadsfromGitv0.99.9k untilv2.33.0. Therecursivestrategytakesthesameoptionsasort.However, therearethreeadditionaloptionsthatortignores(notdocumented above)thatarepotentiallyusefulwiththerecursivestrategy: patience Deprecatedsynonymfordiff-algorithm=patience. diff-algorithm=[patience|minimal|histogram|myers] Useadifferentdiffalgorithmwhilemerging,whichcanhelp avoidmismergesthatoccurduetounimportantmatchinglines (suchasbracesfromdistinctfunctions).Seealso git-diff[1]--diff-algorithm.Notethatort specificallyusesdiff-algorithm=histogram,whilerecursive defaultstothediff.algorithmconfigsetting. no-renames Turnoffrenamedetection.Thisoverridesthemerge.renames configurationvariable. Seealsogit-diff[1]--no-renames. resolve Thiscanonlyresolvetwoheads(i.e.thecurrentbranch andanotherbranchyoupulledfrom)usinga3-waymerge algorithm.Ittriestocarefullydetectcriss-cross mergeambiguities.Itdoesnothandlerenames. octopus Thisresolvescaseswithmorethantwoheads,butrefusestodo acomplexmergethatneedsmanualresolution.Itis primarilymeanttobeusedforbundlingtopicbranch headstogether.Thisisthedefaultmergestrategywhen pullingormergingmorethanonebranch. ours Thisresolvesanynumberofheads,buttheresultingtreeofthe mergeisalwaysthatofthecurrentbranchhead,effectively ignoringallchangesfromallotherbranches.Itismeantto beusedtosupersedeolddevelopmenthistoryofside branches.Notethatthisisdifferentfromthe-Xoursoptionto therecursivemergestrategy. subtree Thisisamodifiedortstrategy.WhenmergingtreesAand B,ifBcorrespondstoasubtreeofA,Bisfirstadjustedto matchthetreestructureofA,insteadofreadingthetreesat thesamelevel.Thisadjustmentisalsodonetothecommon ancestortree. Withthestrategiesthatuse3-waymerge(includingthedefault,ort), ifachangeismadeonbothbranches,butlaterrevertedononeofthe branches,thatchangewillbepresentinthemergedresult;somepeoplefind thisbehaviorconfusing.Itoccursbecauseonlytheheadsandthemergebase areconsideredwhenperformingamerge,nottheindividualcommits.Themerge algorithmthereforeconsiderstherevertedchangeasnochangeatall,and substitutesthechangedversioninstead. CONFIGURATION merge.conflictStyle Specifythestyleinwhichconflictedhunksarewrittenoutto workingtreefilesuponmerge.Thedefaultis"merge",which showsa<<<<<<>>>>>>marker.Analternatestyle,"diff3",addsa||||||| markerandtheoriginaltextbeforethe=======marker.The "merge"styletendstoproducesmallerconflictregionsthandiff3, bothbecauseoftheexclusionoftheoriginaltext,andbecause whenasubsetoflinesmatchonthetwosidestheyarejustpulled outoftheconflictregion.Anotheralternatestyle,"zdiff3",is similartodiff3butremovesmatchinglinesonthetwosidesfrom theconflictregionwhenthosematchinglinesappearneareither thebeginningorendofaconflictregion. merge.defaultToUpstream Ifmergeiscalledwithoutanycommitargument,mergetheupstream branchesconfiguredforthecurrentbranchbyusingtheirlast observedvaluesstoredintheirremote-trackingbranches. Thevaluesofthebranch..mergethatnamethe branchesattheremotenamedbybranch..remote areconsulted,andthentheyaremappedviaremote..fetch totheircorrespondingremote-trackingbranches,andthetipsof thesetrackingbranchesaremerged.Defaultstotrue. merge.ff Bydefault,Gitdoesnotcreateanextramergecommitwhenmerging acommitthatisadescendantofthecurrentcommit.Instead,the tipofthecurrentbranchisfast-forwarded.Whensettofalse, thisvariabletellsGittocreateanextramergecommitinsuch acase(equivalenttogivingthe--no-ffoptionfromthecommand line).Whensettoonly,onlysuchfast-forwardmergesare allowed(equivalenttogivingthe--ff-onlyoptionfromthe commandline). merge.verifySignatures Iftrue,thisisequivalenttothe--verify-signaturescommand lineoption.Seegit-merge[1]fordetails. merge.branchdesc Inadditiontobranchnames,populatethelogmessagewith thebranchdescriptiontextassociatedwiththem.Defaults tofalse. merge.log Inadditiontobranchnames,populatethelogmessagewithat mostthespecifiednumberofone-linedescriptionsfromthe actualcommitsthatarebeingmerged.Defaultstofalse,and trueisasynonymfor20. merge.suppressDest Byaddingaglobthatmatchesthenamesofintegration branchestothismulti-valuedconfigurationvariable,the defaultmergemessagecomputedformergesintothese integrationbrancheswillomit"into"from itstitle. Anelementwithanemptyvaluecanbeusedtoclearthelist ofglobsaccumulatedfrompreviousconfigurationentries. Whenthereisnomerge.suppressDestvariabledefined,the defaultvalueofmasterisusedforbackwardcompatibility. merge.renameLimit Thenumberoffilestoconsiderintheexhaustiveportionof renamedetectionduringamerge.Ifnotspecified,defaults tothevalueofdiff.renameLimit.Ifneither merge.renameLimitnordiff.renameLimitarespecified, currentlydefaultsto7000.Thissettinghasnoeffectif renamedetectionisturnedoff. merge.renames WhetherGitdetectsrenames.Ifsetto"false",renamedetection isdisabled.Ifsetto"true",basicrenamedetectionisenabled. Defaultstothevalueofdiff.renames. merge.directoryRenames WhetherGitdetectsdirectoryrenames,affectingwhathappensat mergetimetonewfilesaddedtoadirectoryononesideof historywhenthatdirectorywasrenamedontheothersideof history.Ifmerge.directoryRenamesissetto"false",directory renamedetectionisdisabled,meaningthatsuchnewfileswillbe leftbehindintheolddirectory.Ifsetto"true",directory renamedetectionisenabled,meaningthatsuchnewfileswillbe movedintothenewdirectory.Ifsetto"conflict",aconflict willbereportedforsuchpaths.Ifmerge.renamesisfalse, merge.directoryRenamesisignoredandtreatedasfalse.Defaults to"conflict". merge.renormalize TellGitthatcanonicalrepresentationoffilesinthe repositoryhaschangedovertime(e.g.earliercommitsrecord textfileswithCRLFlineendings,butrecentonesuseLFline endings).Insucharepository,Gitcanconvertthedata recordedincommitstoacanonicalformbeforeperforminga mergetoreduceunnecessaryconflicts.Formoreinformation, seesection"Mergingbrancheswithdifferingcheckin/checkout attributes"ingitattributes[5]. merge.stat WhethertoprintthediffstatbetweenORIG_HEADandthemergeresult attheendofthemerge.Truebydefault. merge.autoStash Whensettotrue,automaticallycreateatemporarystashentry beforetheoperationbegins,andapplyitaftertheoperation ends.Thismeansthatyoucanrunmergeonadirtyworktree. However,usewithcare:thefinalstashapplicationaftera successfulmergemightresultinnon-trivialconflicts. Thisoptioncanbeoverriddenbythe--no-autostashand --autostashoptionsofgit-merge[1]. Defaultstofalse. merge.tool Controlswhichmergetoolisusedbygit-mergetool[1]. Thelistbelowshowsthevalidbuilt-invalues. Anyothervalueistreatedasacustommergetoolandrequires thatacorrespondingmergetool..cmdvariableisdefined. merge.guitool Controlswhichmergetoolisusedbygit-mergetool[1]whenthe -g/--guiflagisspecified.Thelistbelowshowsthevalidbuilt-invalues. Anyothervalueistreatedasacustommergetoolandrequiresthata correspondingmergetool..cmdvariableisdefined. araxis bc codecompare deltawalker diffmerge diffuse ecmerge emerge examdiff guiffy gvimdiff kdiff3 meld nvimdiff opendiff p4merge smerge tkdiff tortoisemerge vimdiff winmerge xxdiff merge.verbosity Controlstheamountofoutputshownbytherecursivemerge strategy.Level0outputsnothingexceptafinalerror messageifconflictsweredetected.Level1outputsonly conflicts,2outputsconflictsandfilechanges.Level5and aboveoutputsdebugginginformation.Thedefaultislevel2. CanbeoverriddenbytheGIT_MERGE_VERBOSITYenvironmentvariable. merge..name Definesahuman-readablenameforacustomlow-level mergedriver.Seegitattributes[5]fordetails. merge..driver Definesthecommandthatimplementsacustomlow-level mergedriver.Seegitattributes[5]fordetails. merge..recursive Namesalow-levelmergedrivertobeusedwhen performinganinternalmergebetweencommonancestors. Seegitattributes[5]fordetails. branch..mergeOptions Setsdefaultoptionsformergingintobranch.Thesyntaxand supportedoptionsarethesameasthoseofgitmerge,butoption valuescontainingwhitespacecharactersarecurrentlynotsupported. SEEALSO git-fmt-merge-msg[1],git-pull[1], gitattributes[5], git-reset[1], git-diff[1],git-ls-files[1], git-add[1],git-rm[1], git-mergetool[1] GIT Partofthegit[1]suite