YsummarY, use Tab ↹, Return/Enter and go back (⌘ + ←) to navigate.

Never* use git pull

Key points from the YouTube video transcript:

Problem: Pushing commits to a remote branch is rejected because someone else (John) pushed their changes first, resulting in your local branch being behind the remote branch.
Incorrect Solution (and why): git pull creates an unnecessary merge commit, cluttering the commit history over time. This makes it difficult to track changes and understand the project’s development.
Correct Solution: git pull --rebase applies your commits on top of the latest remote commits, keeping the history linear and clean. This avoids creating extra merge commits.
Merge Conflicts: If a merge conflict arises with git pull --rebase, git rebase --abort will undo the rebase and return your local repository to its previous state. You can then use a regular git pull to resolve the conflict manually.
Recommendation: The author advocates using git pull --rebase almost exclusively, falling back to a standard git pull only when merge conflicts occur and require manual resolution.
Git Alias: The author suggests creating a git alias (git config --global alias.pr "pull --rebase") to shorten the git pull --rebase command.
Future Video: A future video will cover interactive rebasing for more advanced merge conflict resolution.