Resolving merge conflicts after a Git rebase - GitHub Docs

error: could not apply fa39187... something to add to patch A When you have resolved this problem, run "git rebase --continue". If you prefer to skip this ... SkiptomaincontentGitHubDocsAllproductsGetstartedQuickstartHelloWorldSetupGitCreatearepoForkarepoGitHubflowContributingtoprojectsBesocialCommunicatingonGitHubGitHubglossaryGitcheatsheetLearningresourcesOnboardingGettingstartedwithyourGitHubaccountGettingstartedwithGitHubTeamGettingstartedwithGitHubEnterpriseCloudLearningaboutGitHubGitHub’sproductsDocsversionsGitHublanguagesupportTypesofGitHubaccountsAccesspermissionsGitHubAdvancedSecurityChangestoGitHubplansSigningupforGitHubSignupforanewGitHubaccountVerifyyouremailaddressEnterpriseCloudtrialEnterpriseServertrialUsingGitHubFeaturepreviewSupportedbrowsersGitHubCLIGitHubDesktopGitHubMobileKeyboardshortcutsGitHubCommandPaletteConnectivityproblemsWritingonGitHubStartwritingonGitHubWrite&formatonGitHubBasicformattingsyntaxWorkwithadvancedformattingOrganizeddatawithtablesCollapsedsectionsCreatecodeblocksCreatediagramsMathematicalexpressionsAutolinkedreferencesAttachingfilesPermanentlinkstocodeUsingkeywordsinissuesandpullrequestsWorkwithsavedrepliesAboutsavedrepliesCreatingasavedreplyEditingasavedreplyDeletingasavedreplyUsingsavedrepliesSharecontentwithgistsCreatinggistsForkingandcloninggistsImportingyourprojectsImportcodetoGitHubAboutGitHubImporterUseGitHubImporterUpdateauthorGitHubImporterImportrepolocallyAddlocallyhostedcodeCodemigrationtoolsWorkwithSubversiononGitHubSubversion&GitdifferencesSupportforSubversionclientsPropertiessupportedbyGitHubExploreprojectsContributetoopensourceSavereposwithstarsFollowingpeopleFollowingorganizationsGettingstartedwithGitSetyourusernameCachingcredentialsGitpasswordsmacOSKeychaincredentialsGitworkflowsAboutremoterepositoriesManageremoterepositoriesAssociatetexteditorsHandlelineendingsIgnoringfilesUsingGitAboutGitPushcommitstoaremoteGetchangesfromaremoteNon-fast-forwarderrorSplittingasubfolderAboutGitsubtreemergesAboutGitrebaseGitrebaseResolveconflictsafterrebaseSpecialcharactersinnamesCustomizeyourworkflowExploringintegrationsAboutintegrationsAboutwebhooksAboutGitHubMarketplaceExtensions&integrationsInstallMarketplaceappsInstallapppersonalaccountInstallapporganizationPrivacyonGitHubGitHub'suseofyourdataRequestaccountarchiveManagedatauseforprivaterepoGitHubArchiveprogramResolvingmergeconflictsafteraGitrebaseWhenyouperformagitrebaseoperation,you'retypicallymovingcommitsaround.Becauseofthis,youmightgetintoasituationwhereamergeconflictisintroduced.Thatmeansthattwoofyourcommitsmodifiedthesamelineinthesamefile,andGitdoesn'tknowwhichchangetoapply.Afteryoureorderandmanipulatecommitsusinggitrebase,shouldamergeconflictoccur,Gitwilltellyousowiththefollowingmessageprintedtotheterminal: error:couldnotapplyfa39187...somethingtoaddtopatchA Whenyouhaveresolvedthisproblem,run"gitrebase--continue". Ifyouprefertoskipthispatch,run"gitrebase--skip"instead. Tocheckouttheoriginalbranchandstoprebasing,run"gitrebase--abort". Couldnotapplyfa39187f3c3dfd2ab5faa38ac01cf3de7ce2e841...Changefakefile Here,Gitistellingyouwhichcommitiscausingtheconflict(fa39187).You'regiventhreechoices: Youcanrungitrebase--aborttocompletelyundotherebase.Gitwillreturnyoutoyourbranch'sstateasitwasbeforegitrebasewascalled. Youcanrungitrebase--skiptocompletelyskipthecommit.Thatmeansthatnoneofthechangesintroducedbytheproblematiccommitwillbeincluded.Itisveryrarethatyouwouldchoosethisoption. Youcanfixtheconflict. Tofixtheconflict,youcanfollowthestandardproceduresforresolvingmergeconflictsfromthecommandline.Whenyou'refinished,you'llneedtocallgitrebase--continueinorderforGittocontinueprocessingtherestoftherebase.