How to fix hint: Updates were rejected because the tip of your current branch is behind its remote counterpart in Git

# Fetch and merge remote changes
git pull origin <branch-name>

# Then push your changes
git push origin <branch-name>

# Example with main branch
git pull origin main
git push origin main

# If conflicts occur during pull:
# 1. Open conflicting files and resolve conflicts
# 2. Stage the resolved files
git add <resolved-files>

# 3. Complete the merge
git commit -m "Merge remote changes"

# 4. Push
git push origin <branch-name>

# Fetch remote changes and rebase your commits on top
git pull --rebase origin <branch-name>

# Then push
git push origin <branch-name>

# Set for current repository
git config pull.rebase true

# Set globally for all repositories
git config --global pull.rebase true

# Resolve conflicts in the indicated files
# Then continue the rebase
git add <resolved-files>
git rebase --continue

# Or abort if things go wrong
git rebase --abort

# Standard force push (use with caution)
git push --force origin <branch-name>

# Safer: force-with-lease (recommended)
git push --force-with-lease origin <branch-name>

# force-with-lease fails if remote has new commits
git push --force-with-lease origin feature-branch
# error: failed to push some refs (if remote changed)

# After this error, fetch and review:
git fetch origin
git log origin/feature-branch --oneline

# Fetch remote changes without merging
git fetch origin

# See commits on remote that you don't have locally
git log HEAD..origin/<branch-name> --oneline

# See commits you have locally that aren't on remote
git log origin/<branch-name>..HEAD --oneline

# See all differences
git log --oneline --left-right HEAD...origin/<branch-name>
# < means local commit, > means remote commit

# Compare the actual code changes
git diff HEAD origin/<branch-name>

$ git log --oneline --left-right HEAD...origin/main
< abc1234 Your local commit
< def5678 Another local commit
> 111aaaa Remote commit from teammate
> 222bbbb Another remote commit

# After amending
git commit --amend -m "Updated commit message"

# Force push the amended commit
git push --force-with-lease origin <branch-name>

# Undo the amend
git reset --soft HEAD@{1}

# Create a new separate commit with the changes
git commit -m "Additional changes"

# Normal push works now
git push origin <branch-name>

# See who has been pushing to this branch
git log --format='%an' origin/<branch-name> | sort | uniq

# If others have pushed, coordinate with them before force pushing

# After rebasing onto main
git checkout feature-branch
git rebase main

# Force push the rebased branch
git push --force-with-lease origin feature-branch

# After someone force pushes a rebased branch
git fetch origin
git checkout feature-branch
git reset --hard origin/feature-branch

# Or if they have local commits to preserve:
git fetch origin
git rebase origin/feature-branch

# Set upstream when pushing a new branch
git push -u origin <branch-name>
# or
git push --set-upstream origin <branch-name>

# After this, you can use shorter commands:
git pull    # instead of git pull origin <branch-name>
git push    # instead of git push origin <branch-name>

# See what branch you're tracking
git branch -vv

# Output shows tracking info in brackets:
# * main abc1234 [origin/main] Latest commit message
# feature def5678 [origin/feature: ahead 2, behind 1] Feature work