Predict Rebase Conflict
Predict Output Medium
Question
During `git rebase main`, a conflict occurs. What does Git do?
Code
git rebase main
Hint
Rebase pauses on conflict, waiting for you to resolve.
Explanation
When a rebase hits a conflict, Git pauses the rebase process and marks the conflicted files with conflict markers. It prints a message indicating which file(s) have conflicts. You must resolve each conflict, git add the resolved files, and run git rebase --continue to proceed. Use git rebase --abort to cancel.
Related Resources
Related Lessons
Related Cheatsheets
Look up unfamiliar terms
A beginner-friendly glossary explains jargon in plain English — variables, functions, DOM, Promise, and more.
Decode error messages
Plain-English explanations of common errors — what they mean, why they happen, and how to fix them.
Build real projects
Apply what you learned by building guided projects with starter code and solutions.