Push & Pull
๐ Covered in this chapter:
git push ยท git push -u ยท git pull ยท Non-Fast-Forward Errors
Synchronize your local commits with a remote repository using git push and git pull.
1Push & Pull โ What You'll Learn
Synchronize your local commits with a remote repository using git push and git pull.
Here's everything this chapter covers, in the order you'll learn it:
- git push to upload local commits
- Your first push to a new remote
- Setting the upstream branch
- git push -u for linking local and remote branches
- Pushing a feature branch
- git pull to download and merge remote changes
- How pull combines fetch + merge
- Pulling with rebase as an alternative
- Handling pull conflicts
- Push rejections and non-fast-forward errors
- A safe pull-before-push workflow
2Working Example
๐ป Example: Push & Pull
Bash
git push -u origin main
git pull origin main
git push origin feature/java-tutorial
3Best Practices & Common Pitfalls
๐ก Key things to remember:
- A 'non-fast-forward' push rejection means the remote has commits you don't have locally โ always git pull first to incorporate them before pushing again.
โ Frequently Asked Questions (FAQ)
Q What's the most important thing to understand about push & pull?
Focus on: git push ยท git push -u ยท git pull ยท Non-Fast-Forward Errors. These are the core building blocks this chapter's examples are built around, and they show up repeatedly in later chapters of this course.
Q Is push & pull something I'll use often in real projects?
Yes โ every concept in this chapter reflects a real, everyday part of professional Git and GitHub workflows, not just a theoretical exercise.