07What actually causes a merge conflict, and how do you resolve one without breaking anything?▼easyNewGitLabMicrosoftInfosysunlockedGit merges by comparing both branches against their common ancestor. A conflict means both sides changed the same region, and the resolution nobody checks is the one that compiles and is semantically wrong.Open full answer →
09Explain fetch versus pull, then tell me when you would rebase rather than merge and what that does to a branch others have pulled.▼mediumNewGitLabAtlassianMicrosoft2 repliesunlockedFollow commit identities through a rebase, recover a collaborator’s work with an explicit boundary, and explain the limits of force-with-lease and revert.Open full answer →
