Pushing and Pulling Code: git push -u origin main and git pull

Once your local repository is connected to a remote on GitHub, you transfer commits back and forth using git push (uploading local changes to the cloud) and git pull (downloading cloud updates into your local machine).

1. Pushing Code: git push

The git push command exports commits from your local repository to a branch on the remote server.

The First Push: Setting Upstream Tracking (-u)

The very first time you push a newly created branch to a remote, you must tell Git which remote branch should track your local branch:

What does the -u (or --set-upstream) flag do?

• It binds your local main branch to the remote branch origin/main.
• For all future pushes and pulls on this branch, you no longer need to type origin main. You can simply type:

Terminal Output:

2. Pulling Code: git pull vs. git fetch

When working in a team or across multiple computers, teammates will push new commits to GitHub. You must pull these commits down to stay updated.

Deep Dive: What is git pull Really Doing?

git pull is actually a combination of two underlying Git commands:

1. 1
   git fetch: Downloads all commits, branches, and tags from the remote repository into your local .git folder, updating remote-tracking branches (like origin/main), but leaves your working directory untouched.
2. 2
   git merge origin/main: Integrates the fetched commits into your active local branch.

Or execute both in one command:

3. Dealing with Rejected Pushes (Non-Fast-Forward)

If a colleague pushed commits to GitHub while you were working locally, GitHub will reject your push with:

The Standard Fix:

1. 1
   Pull the colleague's commits down to your local machine:

1. 1
   If there are merge conflicts, resolve them and commit.
2. 2
   Now push your combined work cleanly: