GitUnstuck

# 1. Initialize local repository with default branch 'main'
git init -b main

# 2. Stage all initial files and make the first milestone
git add .
git commit -m "feat: initial project setup"

# 3. Link to your empty GitHub repository and push
git remote add origin https://github.com/username/repo.git
git push -u origin main

# 1. Download complete repository history into a new folder:
git clone https://github.com/username/repo.git

# 2. Enter directory and inspect status:
cd repo
git status

# 3. List all local and remote branches:
git branch -a

# 1. Review status of modified files:
git status

# 2. Stage specific intended files:
git add src/app.js

# 3. Review the exact staged snapshot:
git diff --staged

# 4. Commit with a clear note:
git commit -m "feat: add user authentication"

# 1. Create and switch to a new branch:
git switch -c feature/redesign

# 2. Work safely, edit files, and commit:
git add src/redesign.css
git commit -m "style: apply new color palette"

# 3. Return to main branch when ready:
git switch main

# 1. Unstage a file (SAFE: keeps your local edits in file):
git restore --staged src/app.js

# 2. Discard uncommitted edits (PERMANENT: overwrites file):
git restore src/app.js

# 3. Undo a pushed commit safely with an inverse commit:
git revert a1b2c3d

# 1. Download remote changes WITHOUT altering working files:
git fetch origin

# 2. Pull & integrate linearly into your branch:
git pull --rebase origin main

# 3. Upload your commits to remote:
git push origin feature/my-branch

# Remote URL conventions across hosts:
git remote add origin https://github.com/user/repo.git     # GitHub
git remote add origin https://gitlab.com/user/repo.git     # GitLab
git remote add origin https://bitbucket.org/user/repo.git  # Bitbucket

# .github/workflows/ci.yml
name: CI
on: [push, pull_request]

jobs:
  test:
    runs-on: ubuntu-latest
    steps:
      - uses: actions/checkout@v4
      - name: Run Tests
        run: npm test

# 1. Stash changes (use -u to include newly created files):
git stash push -u -m "WIP: navigation refactor"

# 2. Your workspace is now clean. Switch branches or patch...
git switch hotfix

# 3. Return to branch and pop your shelved work:
git stash pop

<<<<<<< HEAD
const apiEndpoint = "https://api.v2.internal";
=======
const apiEndpoint = "https://api.v3.production";
>>>>>>> feature/endpoint-upgrade

# 1. Edit file: delete the 3 marker lines and keep the right code
# 2. Mark conflict resolved:
git add src/config.js

# 3. Finalize merge (or abort if you need to rethink):
git merge --continue   # Or 'git merge --abort'

# 1. Create an annotated release tag:
git tag -a v1.0.0 -m "Release v1.0.0: Initial public launch"

# 2. Push tag to GitHub (tags are not pushed by default!):
git push origin v1.0.0

# Or push all local tags at once:
git push origin --tags

# List all tags sorted by version:
git tag -l -n 1