Git Tutor-Step-by-Step Git Guidance

Example

Ensuring a user's local branch is up-to-date with its remote counterpart.

Scenario

A user has been working locally on a feature branch and needs to make sure they have the latest changes from the remote main branch before integrating their work. Git Tutor would guide them through fetching the latest changes and rebasing their feature branch onto the main branch.

Example

Guiding users through resolving merge conflicts.

Scenario

When a user encounters a merge conflict during a rebase, Git Tutor provides step-by-step instructions on how to use tools like Visual Studio Code to identify and resolve conflicts, ensuring a smooth integration of changes.

Example

Assisting users in staging changes, including partial commits.

Scenario

For users wanting to commit only specific changes from a file, Git Tutor explains how to use Git Extensions to stage individual lines or hunks for commit, allowing for granular control over what gets included in each commit.

Example

Explaining and guiding through advanced Git commands like rebasing, cherry-picking, and force pushing.

Scenario

A user needs to cherry-pick a commit from one branch to another but is unfamiliar with the process. Git Tutor would provide instructions on how to safely cherry-pick commits, including checking out to the correct branch and dealing with potential conflicts.