Medium Git Challenges - Intermediate Practice

Learn to properly configure .gitignore to exclude files you don't want to track, and how to handle files that were accidentally committed.

The standard workflow for developing a new feature is to create a dedicated branch. This keeps the 'main' branch clean and allows for code reviews before merging.

Your feature branch was created yesterday. Today, main has several new commits. Use rebase to build your feature on top of the latest main, keeping a clean linear history.

You have local commits on main, but a teammate pushed new commits to origin/main. Use git pull --rebase to avoid unnecessary merge commits.

You've been working on a feature, and in the meantime, someone else changed the same line of code on the 'main' branch. It's time to merge, and you need to resolve the conflict.

You want to contribute to an open-source project. Learn the fork workflow: create your own copy, make changes, and submit a pull request.

Your feature branch has messy commit history: 'WIP', 'fix typo', 'actually fix it'. Before submitting a PR, clean it up by squashing commits into one logical change.

After pushing your feature branch, a reviewer requests changes. Learn to amend your commit and update the pull request.

You've made a commit you want to undo locally. git reset is the tool, but it has three modes: soft, mixed, and hard. Understanding them is key to avoiding data loss.

You've pushed a commit to a shared branch that introduced a bug. You can't use git reset because it rewrites history. The safe way is with git revert.