Merge conflicts - GitLab Docs

Merge conflicts sample workflow · Check out a new branch and edit conflicts.rb . · Commit and push. · Check out main and edit conflicts.rb . · Commit and push to ... Docs What'snew? GitLab.com(15.1-pre) GitLab.com(15.1-pre) 15.0 14.10 14.9 14.10 13.12 Archives Getfreetrial GitLabDocs LearnGitLabwithtutorials Chooseasubscription GitLabSaaSsubscriptions Self-managedsubscriptions GitLabDedicatedsubscriptions Quarterlyreconciliation Storageusagequota CI/CDminutesquota Freeuserlimit ActivateEnterpriseEdition FeaturesavailabletoStarterandBronzesubscribers InstallGitLab Requirements PostgreSQLextensions Installationmethods Linuxpackages(Omnibus) Architecture Omnibuspackagesandimages Packageinformation Packagedefaults Packagelicensing Packagesignatures PostgreSQLversions Installation Deprecationpolicy SupportedOSes Manualinstallation InstallJiHuEdition Configure ActionCable Backups Configurationoptions Customenvironmentvariables Database GitLabMattermost Grafana Highavailabilityroles Logs NGINX GitalyCluster Prometheus Puma RaspberryPi Redis SMTP SSL DNS Imagescaling Memory-constrainedenvironments Releaseprocess Maintain Troubleshoot CloudNative InstallwithHelmCharts Install Requiredtools Cloudclusterpreparation AKS EKS GKE OpenShift InstallwithHelmCharts Upgrade BackupandRestore Backup Restore MigratefromOmnibus MigratefromtheLinuxpackage MigratetotheLinuxpackage MigratebetweenHelmversions MigratetoMinIO Versionmappings Configure Globals GitLabsub-charts Gitalychart GitLabExporterchart GitLabGrafanachart GitLabPageschart GitLabRunnerchart GitLabShellchart KASchart Migrationschart Praefectchart Sidekiqchart Toolboxchart Webservicechart Miniochart Nginxchart Redischart RedisHAchart Registrychart Advanced Externaldatabase ExternalGitaly ExternalMattermost ExternalNginx Externalobjectstorage ExternalRedis Persistentvolumes Troubleshoot InstallwithGitLabOperator Install Backupandrestore UpgradeGitLab SupportforGitoverSSH UpgradetheOperator Securitycontextconstraints Docker Fromsource InstallunderarelativeURL Troubleshooting Cloudprovidersguides Azure GoogleCloudPlatform(GCP) AmazonWebServices(AWS) EKSbestpractices GitLabSREforAWS GitLabCloudNativeHybridonAWSEKS ManualinstallonAWS OfflineGitLab OfflineGitLabinstallation ReferenceArchitectures Upto1,000users Upto2,000users Upto3,000users Upto5,000users Upto10,000users Upto25,000users Upto50,000users Troubleshooting Stepsafterinstalling UpgradeGitLab Plananupgrade UpgradeOmnibusinstance ConverttoOmnibus ConverttoEnterpriseEdition Packagesignatures GitLab14changes GitLab13changes GitLab12changes GitLab11changes GitLab10changes Downgrade Upgradesourceinstance Patchversions ChangefromCommunityEditiontoEnterpriseEdition Zero-downtimeupgrades ChangefromEnterpriseEditiontoCommunityEdition Releasesandmaintenance Deprecationsbyversion Removalsbyversion What'snew InstallGitLabRunner Install Docker FreeBSD Kubernetes(HelmChart) Kubernetes(Agent) Kubernetes(Operator) Linux macOS Windows Bleedingedgereleases OfficialLinuxpackages OldGitLabRunnerURLs Configure Advancedconfig Autoscaleconfig AutoscaleonAWSEC2 AutoscaleonAWSFargate Commands Featureflags macOSsetup RunnerOperatoronOpenShift Runningbehindaproxy Ratelimitedrequests Self-signedcertificates Systemservices Speedupjobexecution Troubleshoot Integrateapplications Akismet ArkoseProtect Datadog Elasticsearch Gitpod Jiraintegrations ConfiguretheJiraintegration GitLabforJiraapp JiraDVCSconnector JiraDevelopmentPanel CreateJiraServeruser CreateJiraCloudAPItoken Jiraintegrationissuemanagement Krokidiagrams Mailgun PlantUML Projectintegrationmanagement Projectintegrations Asana BambooCI Discord Emailsonpush GitHub GoogleChat Irker Jenkins Jenkins(deprecated) Mattermostnotifications Mattermostslashcommands MicrosoftTeams MockCI Pipelinestatusemails PivotalTracker Prometheus ServiceNow Slacknotifications Slackslashcommands Slashcommands Slackapplication UnifyCircuit WebexTeams Webhooks Webhookevents Externalissuetracker Bugzilla Customissuetracker IBMEngineeringWorkflowManagement Redmine YouTrack ZenTao Gmailactionsbuttons reCAPTCHA Securitypartners Sourcegraph Trello VisualStudioCodeextension AdministerGitLab Getstarted Configureyourinstallation Authenticationandauthorization AliCloud AtlassianCrowd Atlassian Auth0 Authentiq AWSCognito Azure BitbucketCloud CAS DingTalk Facebook GenericOAuth2 GitHub GitLab.com Google JWT Kerberos LDAP LDAPsynchronization LDAP(GoogleSecure) LDAPtroubleshooting OAuthserviceprovider OmniAuth OpenIDConnectOmniAuth OpenIDConnectidentity Salesforce SAML Smartcard Twitter Vault CI/CD ConfigurationandAdminArea AdminAreasettings Accountandlimitsettings Appearance Authentication Batchedbackgroundmigrations CI/CD Applicationcacheinterval Custominstance-levelprojecttemplates DeprecatedAPIratelimits Difflimits Email Externalauthorization Externalpipelinevalidation Enablefeatureswithfeatureflags AvailableGitLabfeatureflags FederatedLearningofCohorts(FLoC) Geonodes GitLFSadministration GitLabPages GitLabPagesforsourceinstallations HealthCheck Instancetemplaterepository Jobartifacts Joblogs Labels Logsystem MaintenanceMode Mergerequestapprovals PackageRegistryratelimits Pollingintervalmultiplier Protectedpaths Pusheventactivitieslimit RatelimitsonRepositoryfilesAPI RatelimitsonGitLFS Ratelimitsonissuecreation Ratelimitsonrawendpoints Ratelimitsonnotecreation RatelimitsonUsersAPI Ratelimitsonpipelinecreation Replybyemail Repositorychecks Sign-inandhelppagetext Sign-inrestrictions Sign-uprestrictions Spamcheck SystemHooks Third-partyoffers Timezone Uploads UserCohorts Visibilityandaccesscontrols Consul Environmentvariables Filehooks Gitprotocolv2 Incomingemail Instancelimits InstanceReview PostgreSQL Replicationandfailover Standalonepackageddatabase PgBouncer DatabaseLoadBalancing Externaldatabaseservice Loadbalancer NFS Postfix Redis ConfigurethebundledRedisforreplication ConfigureyourownRedisforreplication StandaloneRedisconfiguration Troubleshooting Sidekiq Sidekiqhealthcheck Sidekiqjobsizelimits S/MIMEsigning Repositorystorage Repositorystoragetypes GitalyandGitalyCluster ConfigureGitaly ConfigureGitalyCluster Monitoring Recoveryoptions Troubleshooting Gitalyreference Gitalytimeouts Objectstorage Mergerequestdiffsstorage Staticobjectsexternalstorage Geo SettingupGeo Databasereplication ExternalPostgreSQLinstances Configuration UsingaGeosite Configuresecondaryproxying Location-awarepublicURL UpgradingGeosites Version-specificupgrades Usingobjectstorage UsingDockerRegistry Geoformultipleservers Geosecurityreview Location-awareGitremoteURLs TuningGeo DisableGeo RemovingaGeosite Supporteddatatypes Frequentlyaskedquestions Troubleshooting Validationtests GeoGlossary Disasterrecovery(Geo) Plannedfailover Bringprimaryback Automaticbackgroundverification AgentserverforKubernetes Serverhooks Terraformstate Packages ContainerRegistry DependencyProxy Webterminals Wikis InvalidateMarkdowncache Issueclosingpattern Snippets Self-hostthehelppages Maintainyourinstallation Housekeeping FastSSHkeylookup Filesystembenchmarking MultipleSidekiqprocesses Sidekiqroutingrules Railsconsole SidekiqMemoryKiller SwitchtoPuma UseSSHcertificates Enableencryptedconfiguration Raketasks Backupandrestore Cleanup Enablenamespaces Generalmaintenance Geotasks GitHubimport Sidekiqjobmigration SMTP SPDXlicenselistimport Importrepositories Inactiveprojectdeletion Moverepositories Integritycheck LDAPmaintenance Listrepositories Migratesnippets Praefecttasks Projectimportandexport Read-onlystate Repositorystorage RestartGitLab SamplePrometheusdata Uploadsmigration Uploadssanitization Usermanagement Webhooksadministration X509signatures Secureyourinstallation LimitsonSSHkeys Ratelimits Webhooks Informationexclusivity ManagetheCRIMEvulnerability Enforcetwo-factorauthentication(2FA) Useremailconfirmation Securityofrunningjobs Proxyingassets CI/CDvariables Tokenoverview Compliancefeatures Respondtosecurityincidents Administerusers Resetuserpassword Unlockauser Reviewabusereports Unknownsign-ins,emailnotification Userfileuploads Passwordstorage Credentialsinventory Custompasswordlengthlimits Generatedpasswordsandintegratedauthentication Globalusersettings Moderateusers Auditorusers Configurethelibravatarservice Broadcastmessages EmailfromGitLab UseGitLab Setupyourorganization Members Groups Customgroup-levelprojecttemplates Groupaccesstokens Groupimport/export Migratinggroups SAMLSSOforGitLab.comgroups GroupManagedAccounts(ClosedBeta) SCIMprovisioning TroubleshootingGroupSAMLandSCIM Subgroups Moveapersonalprojecttoagroup Useraccountoptions Activesessions Permissionsandroles Personalaccesstokens Profilepreferences Notificationemails Two-factorauthentication Reportabuse Deleteaccount SSHkeys GitLab.comsettings Organizeworkwithprojects Manageprojects Projectvisibility Projectsettings Projectaccesstokens Shareprojects Reservedprojectandgroupnames Search AdvancedSearch AdvancedSearchsyntax Badges Codeintelligence Compliance LicenseCompliance Compliancereport Descriptiontemplates Deploykeys Deploytokens Filefinder GitLabPages Createfromscratch CreateusingaCI/CDtemplate Createusingaforkedsampleproject Createusingaprojecttemplate Defaultdomains,URLs,andbaseurls CustomdomainsandSSL/TLScertificates DNSconcepts SSL/TLSconcepts Let'sEncryptintegration Accesscontrol Redirects ExploringGitLabPages Migratingprojects BitbucketCloud BitbucketServer ClearCase CVS FogBugz GitHub GitLab.com Gitea Jira PerforceHelix Phabricator Repobymanifestfile RepobyURL SVN TFVC Projectimport/export Project/Groupimport/exportratelimits Projectimportachivesizelimits Planandtrackwork Epics Manageepics Linkedepics Epicboards Issues Manageissues Awardemoji Confidentialissues Crosslinkingissues CSVexport CSVimport Designmanagement Duedates Issueboards Multipleassignees Linkedissues ServiceDesk Sortingandorderingissuelists Weight Zoommeetingsinissues Labels Commentsandthreads Customerrelations(CRM) Iterations Milestones Burndownandburnupcharts Requirements Roadmaps Planninghierarchies Tasks Timetracking Wikis Groupwikis Keyboardshortcuts Quickactions Autocompletecharacters Markdown AsciiDoc CSVfiles To-DoList UsingGit Getstarted Terminology InstallingGit CommandlineGit Featurebranchworkflow Featurebranchdevelopment GitLabFlow Addfiletorepository Bisect Cherry-pickacommit Featurebranching Fileediting Gitadd Gitlog Gitstash Mergeconflicts Partialclone Rebase,force-push,mergeconflicts Rollbackcommits Subtree Tags TroubleshootingGit UndowithGit Unstage Usefulcommands Pushoptions Buildyourapplication Repositories Codeowners Snippets Branches Defaultbranch Forkingworkflow Gitattributes GitLFS Jupyternotebookfiles Lockedfiles FileBlame FileHistory Mirroring Bidirectionalmirroring Pullmirroring Pushmirroring Protectedbranches Protectedtags Pushrules Reducerepositorysize SignedCommits SigningcommitsandtagswithX.509 Syntaxhighlighting WebEditor WebIDE Managinglargerepositories Mergerequests Getstarted Approvals Approvalrules Approvalsettings Changes Cherrypickchanges Collaborateacrossforks Commitmessagetemplates Confidentialmergerequests Createmergerequests Draftmergerequests ExportmergerequeststoCSV Externalstatuschecks Mergemethods Squashandmerge Mergerequestdependencies Mergerequestwidgets Mergewhenpipelinesucceeds Mergeconflicts Revertingchanges Reviewingandmanagingmergerequests Suggestions Versions Workflows CI/CD Getstarted CI/CDconcepts MigratefromCircleCI MigratefromJenkins EnableordisableCI/CD Pipelines Scheduledpipelines Triggerapipeline Customizepipelineconfiguration Pipelinearchitectures Pipelineefficiency Pipelineresourcegroups Directedacyclicgraph(DAG) Multi-projectpipelines Parent-childpipelines Mergerequestpipelines Mergedresultspipelines Mergetrains Jobs Choosewhenjobsrun CI/CDjobtoken Accessaterminalforarunningjob Formatscriptsandjoblogs Gitsubmodules Variables Predefinedvariables Wherevariablescanbeused Cacheandartifacts Jobartifacts Pipelineartifacts .gitlab-ci.yml .gitlab-ci.ymlreference OptimizeyourYAMLfiles Validatesyntax PipelineEditor Artifactsreports Includeexamples Workflowexamples Docker RunCI/CDjobsinDockercontainers UseDockertobuildDockerimages UsekanikotobuildDockerimages Services MySQLservice PostgreSQLservice Redisservice GitLabasaservice AutoDevOps Getstarted Requirements Stages Customize UpgradePostgreSQL UpgradeAutoDeploydependencies Troubleshooting Testing Accessibilitytesting Browserperformancetesting Codequality Loadperformancetesting Metricsreports Testcases Testcoveragevisualization Unittestreports Unittestreportexamples SSHkeys Externalsecrets Connecttocloudservices AuthenticatingwithHashiCorpVault ConfigureOpenIDConnectinAWS ConfigureOpenIDConnectwithGoogleCloud ChatOps Externalrepositoryintegrations BitbucketCloud GitHub CI/CDexamples DeploymentwithDpl End-to-endtesting NPMwithsemantic-release PHPwithPHPunitandatoum PHPwithNPMandSCP PHPwithLaravelandEnvoy TroubleshootingCI/CD Runners RunnerSaaS Linux macOS VMinstances Codesigning Windows Thescopeofrunners Registerarunner Examples Runnerexecutors Custom libvirt LXD Docker DockerMachine Kubernetes Shell Supportedshells SSH Parallels VirtualBox Configurerunners Securerunners Scaleafleetofrunners Bestpracticesforlargerepositories Packages&Registries PackageRegistry Composer Conan Debian GoProxy Helm Maven npm NuGet PyPI Rubygems Generic Storeallpackagesinoneproject Monorepoworkflows ReducePackageRegistrystorage ContainerRegistry ReduceContainerRegistrystorage ReduceContainerRegistrydatatransfers InfrastructureRegistry Terraformmoduleregistry DependencyProxy ReduceDependencyProxystorage Secureyourapplication SecurityConfiguration ContainerScanning ClusterImageScanning DependencyScanning DependencyScanningAnalyzers DependencyList StaticApplicationSecurityTesting SASTAnalyzers InfrastructureasCode(IaC)Scanning SecretDetection Post-processingandrevocation DynamicApplicationSecurityTesting(DAST) DASTbrowser-basedcrawler Vulnerabilitychecks DASTAPI DASTTroubleshooting RunDASToffline APIFuzzing HTTPArchiveformat Coverage-guidedfuzztesting SecurityDashboard OfflineEnvironments VulnerabilityReports VulnerabilityPages Vulnerabilityseveritylevels CVEIDrequests Policies Scanexecutionpolicies Scanresultpolicies Securityscannerintegration SecureandProtectTerminology Deployandreleaseyourapplication Environmentsanddeployments EnvironmentsDashboard Protectedenvironments Deploymentsafety Deploymentapprovals Rolloutanapplicationincrementally DeploytoAWS DeploytoAmazonECS Releases ReviewApps Featureflags Monitorapplicationperformance ErrorTracking Tracing Productanalytics Incidentmanagement Alerts Escalationpolicies Pagingandnotifications Incidents Integrations Statuspage On-callschedules Metricsdashboard Setupalertsformetrics EmbeddingmetricsinMarkdown EmbeddingmetricsinGrafana Metricslibrary MonitoringAWSresources HAProxy Kubernetes NGINX NGINXIngress NGINXIngressVTS Customdashboards GitLab-definedmetricsdashboards DashboardYAMLproperties Dashboardsettings Paneltypesfordashboards Usingvariables Templatesforcustomdashboards Templatingvariablesfordashboards Monitorrunnerperformance Manageyourinfrastructure InfrastructureasCode Terraformstate Terraformintegrationinmergerequests TroubleshootTerraform CreateKubernetesclusters AmazonEKS GoogleGKE Civo ConnectKubernetesclusters GitOpsworkflow ManageKubernetessecrets Trackclusterresources GitLabCI/CDworkflow Manageclusterapplications InstalltheagentforKubernetes WorkwiththeagentforKubernetes Vulnerabilityscanning TroubleshoottheagentforKubernetes MigratetotheagentforKubernetes (DEPRECATED)Certificate-basedclusters Createanewcluster Connectanexistingcluster Accesscontrols GitLab-ManagedClusters Managementproject Clusterintegrations Costmanagement Deployapplications Clusterenvironments Clustershealth Deployboards Podlogs Webterminals Runbooks AnalyzeGitLabusage CI/CDanalytics Codereviewanalytics Contributionanalytics DevOpsadoptionbyinstance DevOpsadoptionbygroup Insightsforprojects Insightsforgroups Issueanalyticsforprojects Issueanalyticsforgroups Mergerequestanalytics Productivityanalytics Repositoryanalytics Repositoryanalyticsforgroups Usagetrends Valuestreamanalyticsforprojects Valuestreamanalyticsforgroups Instance-levelanalytics Auditevents Auditeventstreaming Auditreports Metrics ConfigureGitLab ConfigureGrafana GitHubimports GitLabexporter GitLabPrometheusmetrics Selfmonitoringproject IPallowlistendpoints Nodeexporter PGBouncerexporter PostgreSQLserverexporter Prometheus Performancebar Performancemonitoring Redisexporter Registryexporter Usagestatistics Webexporter UsetheAPI RESTAPIresources .gitignore(templates) .gitlab-ci.yml(templates) Accessrequests AgentforKubernetes AlertManagement Appearance(application) Applications Auditevents Avatar Awardemoji Badges(project) Badges(group) Branches Broadcastmessages Commits Composer Conan ContainerRegistry Customattributes Dashboardannotations Debian Debiangroupdistributions Debianprojectdistributions Dependencies DependencyProxy Deploykeys Deploytokens Deployments Discussions Dockerfile(templates) DORA4metrics Environments Epics Errortracking Events Experiments Externalstatuschecks Featureflags Featureflaguserlists Freezeperiods Geonodes GitLabPages GoProxy Groupaccesstokens Groupactivityanalytics GroupImport/Export Grouprelationsexport Grouprepositorystoragemoves Groupwikis Groups Helm Import Instance-levelCI/CDvariables Integrations Invitations Issueboards(project) Issueboards(group) Issues Issues(epic) Issuesstatistics Iterations(project) Iterations(group) Jobs Jobartifacts Keys Labels(project) Labels(group) License Licenses(templates) Linkedepics Links(issue) Links(epic) Managedlicenses Markdown Maven Members Mergerequestapprovals Mergerequestcontextcommits Mergerequests Mergetrains Migrations(bulkimports) Milestones(project) Milestones(group) Namespaces Notes(comments) Notificationsettings npm NuGet Packages Pagesdomains Personalaccesstokens Pipelinesschedules Pipelinetriggers Pipelines Planlimits Projectaccesstokens Projectaliases Projectimport/export Projectrelationsexport Projectremotemirrors Projectrepositorystoragemoves Projectstatistics Projecttemplates Projectvulnerabilities Projects Protectedbranches Project-levelprotectedenvironments Group-levelprotectedenvironments Protectedtags PyPI Releases Releaselinks Repositories Repositoryfiles Repositorysubmodules Resourcegroup Resourceiterationevents Resourcelabelevents Resourcemilestoneevents Resourcestateevents Resourceweightevents Rubygems Runners SCIM Search Settings(application) Sidekiqmetrics Sidekiqqueues Snippetrepositorystoragemoves Snippets Snippets(project) Statistics(application) Suggestions Systemhooks Tags To-Dolists Topics ServiceData Users User-starredmetricsdashboards Variables(project) Variables(group) Version VisualReviewdiscussions Vulnerabilities Vulnerabilityexport VulnerabilityFindings Wikis Wikis(group) OpenAPI GraphQL GetstartedusingGraphQL GraphQLreference Createauditreport(example) Identifyissueboards(example) Queryusers(example) Usecustomemojis(example) Removeditems Lint.gitlab-ci.yml GitLabasanOAuth2provider ContributetoGitLabdevelopment ContributetoGitLab Changelogentries Communityroles Built-inprojecttemplates DesignandUI GitLabDevelopmentKit Issuesworkflow Mergerequestconcepts Mergerequestworkflow Codereviewguidelines Styleguides Approvalrulesdevelopmentguide Architecture AuditEventdevelopmentguide Verifystagedevelopmentguide CI/CDdevelopment Documentingkeywords ContributetotheCI/CDschema CI/CDtemplatedevelopment PipelineWizard AutoDevOpsdevelopment Codeintelligence CodeSandboxdevelopmentenvironment Create-SourceCodebackend Gitalytouchpoints SourceCodeRESTendpoints Dangerbot Databasedevelopment Avoidingdowntimeinmigrations Backgroundmigrations Casestudy-filteringbylabel Casestudy-namespacesstoragestatistics DatabaseLabandPostgres.ai Databasereviewguidelines Databasecheck-migrationsjob Deleteexistingmigrations Layoutandaccesspatterns Migrationsstyleguide Paginationguidelines Paginationperformanceguidelines Keysetpagination Post-deploymentmigrations QuerycommentswithMarginalia SQLguidelines Swappingtables Tablepartitioning TroubleshootingandDebuggingDatabase UnderstandingEXPLAINplans Multipledatabases LooseForeignKeys Deprecationguidelines Developerguidetologging DevelopmentRaketasks MassinsertRailsmodels Documentation Styleguide CreatingaGraphQLexamplepage RESTfulAPIstyleguide Recommendedwordlist Topictypes Process Testing Sitearchitecture Folderstructure Globalnavigation Documentingproductversions Deploymentprocess Documentationreviewapps Redirects Distributedtracing Experiments Implementingexperiments Testingexperiments Experimentcodereviews Experimentrollouts FeatureflagsforGitLabdevelopment Controllingfeatureflags Documentingfeatureflags FeatureflagsAPI Framework-DeclarativePolicy Frontenddevelopment Accessibility Architecture Axios ContentEditor Darkmode Dependencies Designanti-patterns Designpatterns Developmentprocess Eventtracking Emojis FrontendFAQ GraphQL HAML IconsandSVGillustrations Keyboardshortcuts Logging Mergerequestwidgetextensions Performance Principles Registryarchitecture Security Sourceeditor Tooling Troubleshooting Vuex Vue Vue3migration Widgets GitLabPagesdevelopment Geodevelopment Geoframework GitLFS Gitalydevelopment GitLabDesignSystem GitLabdevelopmentstyleguides APIstyleguide Gostandardsandstyleguidelines GraphQLAPIstyleguide Guidelinesforshellcommands HTMLstyleguide JavaScriptstyleguide Newlinesstyleguide Pythondevelopmentguidelines Rubystyleguide SCSSstyleguide Shellscriptingstandardsandstyleguidelines Vuestyleguide GitLabgroupmigration GitLabprojectpipelines GraphQLdevelopment GraphQLauthorization GraphQLBatchLoader GraphQLpagination GraphQLPro Import/Export Integrations InternalAPI InternalallowedAPI Internalusers Issuable-likeRailsmodelsutilities Issuetypes Jenkinsinlocalenvironments Jiradevelopmentenvironment Kubernetesintegration GitLabFlavoredMarkdown(GLFM)developerdocumentation GitLabFlavoredMarkdown(GLFM)specificationguide Observabilityforstagegroups Dashboards Stagegroupdashboard Errorbudgetdetail Packagedevelopment Packagesettings Packagestructure Supportnewformats Permissions ProductQualifiedLead(PQL)guide Real-timefeatures Securepartneronboardingprocess Sidekiqdevelopment Compatibilityacrossupdates Jobidempotencyandjobdeduplication Limitedcapacityworker Logging Workerattributes SpamprotectionandCAPTCHA Modelandservices RESTAPIspamprotection GraphQLAPIspamprotection WebUIspamprotection Exploratorytesting Testingstandardsandstyles Flakytests Frontendtestingstandardsandstyleguidelines Reviewapps Smoketests Testingbestpractices Testinglevels TestingRailsmigrations TestingRaketasks Testing(endtoend) Beginner'sguidetowritingend-to-endtests Bestpracticeswhenwritingend-to-endtests Dynamicelementvalidation FlowsinGitLabQA PageobjectsinGitLabQA ResourceclassinGitLabQA Styleguideforwritingend-to-endtests Testingwithfeatureflags Troubleshooting TranslateGitLab Externalization Translation Proofreading Merging Snowplow ImplementSnowplow SnowplowInfrastructure Schemas Eventdictionaryguide Eventdictionary Reviewguidelines Troubleshooting ServicePingguide Metricslifecycle ImplementServicePing Metricsinstrumentation Metricsdictionaryguide Metricsdictionary MetricsPerformanceIndicator Reviewguidelines Troubleshooting Uploads Addingnewuploads ValueStreamAnalytics Wikis Workitemsandworkitemtypes Workhorse AddingnewfeaturestoWorkhorse Configuration FeaturesthatrelyonWorkhorse Websocketchannelsupport WorkingwithPrometheusmetrics Workspace ContributetoOmibusGitLab Getstarted Buildlocally BuildOmnibusGitLabpackage Buildall-in-oneDockerimage InformationforGitLabteammembers Setupadevelopmentenvironment CIvariables Changepackagebehavior ChangeYAMLconfigoptions Adddeprecationmessages Addnewgitlab-ctlcommands Addnewservices Addnewsoftwaredefinitions Createpatches Addorremoveconfigurationoptions ManagePostgreSQLversions Omnibusmirror VersionformatforthepackagesandDockerimages Pipelines Workwithpublic_attributes.json UpgradeChef Handlevulnerabilities Handlebrokenmasterpipelines DeprecateandremovesupportforanOS ContributetoGitLabRunner ReviewGitLabRunner AddnewWindowsversionsupportforDockerexecutor ContributetoGitLabHelmCharts ArchitectureofCloudnativeGitLabHelmcharts BackupandRestore Goals Architecture DesignDecisions ResourceUsage Environmentsetup Styleguide Versioningandrelease HelpuslearnaboutyourcurrentexperiencewithGitLab!Takethesurvey. × | Mergeconflictssampleworkflow Note Mergeconflicts Happenoften Learningtofixconflictsishard Practicemakesperfect Forcepushafterfixingconflicts.Becareful! Mergeconflictssampleworkflow Checkoutanewbranchandeditconflicts.rb.Add‘Line4’and‘Line5’. Commitandpush. Checkoutmainandeditconflicts.rb.Add‘Line6’and‘Line7’below‘Line3’. Commitandpushtomain`. Createamergerequestandwatchitfail. Rebaseournewbranchwithmain. Fixconflictsontheconflicts.rbfile. Stagethefileandcontinuerebasing. Forcepushthechanges. Finallycontinuewiththemergerequest. gitcheckout-bconflicts_branch #viconflicts.rb #Add'Line4'and'Line5' gitcommit-am"addline4andline5" gitpushoriginconflicts_branch gitcheckoutmain #viconflicts.rb #Add'Line6'and'Line7' gitcommit-am"addline6andline7" gitpushoriginmain CreateamergerequestontheGitLabwebUI,andaconflictwarningdisplays. gitcheckoutconflicts_branch gitfetch gitrebasemain #Fixconflictsbyeditingthefiles. gitaddconflicts.rb #Noneedtocommitthisfile gitrebase--continue #Rememberthatwehaverewrittenourcommithistorysowe #needtoforcepushsothatourremotebranchisrestructured gitpushoriginconflicts_branch-f Note Whentousegitmergeandwhentousegitrebase Rebasewhenupdatingyourbranchwithmain Mergewhenbringingchangesfromfeaturetomain Reference:https://www.atlassian.com/git/tutorials/merging-vs-rebasing Help&feedback Docs Editthispage tofixanerrororaddanimprovementinamergerequest. Createanissue tosuggestanimprovementtothispage. Product Createanissue ifthere'ssomethingyoudon'tlikeaboutthisfeature. Proposefunctionality bysubmittingafeaturerequest. JoinFirstLook tohelpshapenewfeatures. Featureavailabilityandproducttrials Viewpricing toseeallGitLabtiersandfeatures,ortoupgrade. TryGitLabforfree withaccesstoallfeaturesfor30days. GetHelp Ifyoudidn'tfindwhatyouwerelookingfor, searchthedocs. Ifyouwanthelpwithsomethingspecificandcouldusecommunitysupport, postontheGitLabforum. Forproblemssettinguporusingthisfeature(dependingonyourGitLab subscription). Requestsupport