QuestionQ37VerifiedCopy linkReport a problemAsk AstroTutorSave questionA developer pulls changes from a remote repository and runs into conflicts. What must the developer do next?ARemove conflicting files and recreate them based on the latest changesBRevert local changes to restore the previous version before pulling updatesCManually review and resolve conflicts before completing the merge processDPush local changes to overwrite remote updates and force synchronizationShow AnswerAnswerExplanationTo complete a merge with conflicts, the developer reviews and resolves the conflicting changes, stages the resolved files, and continues or commits the merge. (git-scm.com)Learn moreGit documentation: git-mergeShow comments0Show commentsCommunity DiscussionNo comments yet. Be the first to start the discussion!
Community Discussion