git init

# Build output (adjust for your stack)
bin/
obj/
dist/
out/

# IDE / Editor
.vs/
.idea/
*.user
*.suo
.vscode/

# OS
.DS_Store
Thumbs.db

# Environment / secrets
.env
.env.local
*.local

git add .
git status          # review what's staged — confirm no build output appears
git commit -m "Initial commit: scaffold MyApp"

git remote add origin git@gitlab.company.com:team/MyApp.git

# Rename branch to main if needed
git branch -M main

git push -u origin main

git clone git@gitlab.company.com:team/MyApp.git

# Or clone into a specific folder name
git clone git@gitlab.company.com:team/MyApp.git my-local-folder

cd MyApp

git log --oneline --graph -20    # recent history
git branch -a                    # all branches (local + remote)
git remote -v                    # confirm origin points to GitLab

git switch main
git pull

# Create a branch for your work
git switch -c feature/add-user-endpoint

# ... make your changes ...

git status
git diff
git add src/users/users.controller.js
git commit -m "Add GET /users endpoint"

git push -u origin feature/add-user-endpoint

git fetch origin
git rebase origin/main

git switch -c feature/my-work    # create branch at current position
git switch main
git reset --hard origin/main     # reset main back to remote state
git switch feature/my-work       # your changes are safe on the new branch

# 1. Start from latest main
git switch main
git pull

# 2. Create your feature branch
git switch -c feature/user-auth

# 3. Work, commit often
git add -p
git commit -m "Add JWT authentication middleware"

# 4. Keep in sync with main daily
git fetch origin
git rebase origin/main

# 5. Push and open a Merge Request
git push -u origin feature/user-auth

git switch main
git pull
git branch -d feature/user-auth    # clean up local branch

git log --oneline -5

git switch feature/correct-branch
git cherry-pick <commit-hash>

git switch wrong-branch
git reset --hard HEAD~1    # only if not pushed yet

git fetch origin
git rebase origin/main
git push -f origin feature/my-branch

<<<<<<< HEAD
function getUser(id) {
  return db.users.find(id);
}
=======
async function getUser(id) {
  return await db.users.findById(id);
}
>>>>>>> feature/async-refactor

git status                      # shows which files have conflicts
# Edit each conflicted file
git add src/users/service.js    # mark as resolved
git merge --continue            # or: git commit

git fetch origin
git rebase origin/main
# Git pauses on each conflicted commit
# Edit the file, then:
git add src/users/service.js
git rebase --continue

git push -f origin feature/my-branch

# Don't manually merge lock files — accept one side then regenerate
git checkout --ours package-lock.json
# or
git checkout --theirs package-lock.json

# Regenerate
npm install

git add package-lock.json
git rebase --continue

git commit --amend -m "Correct message here"

git reset --soft HEAD~1

git reset HEAD~1

git reset --hard HEAD~1

git log --oneline -10

git revert a1b2c3d    # creates a new "Revert..." commit
git push

git restore src/users/service.js    # one file
git restore .                       # everything

git reflog
# Find the hash of the lost commit

git cherry-pick f6e5d4c    # bring it back

git rm --cached .env
echo ".env" >> .gitignore
git commit -m "Stop tracking .env"

git stash          # save tracked changes
git stash -u       # also include untracked (new) files

git stash push -m "WIP: token validation logic, halfway done"

# Mid-feature, urgent task arrives
git stash push -m "WIP: token validation"

git switch main
git pull
git switch -c hotfix/login-crash
# ... fix, commit, push ...

# Return to your feature
git switch feature/user-auth
git stash pop

git stash list                  # see all stashes
git stash pop                   # apply most recent AND remove from list
git stash apply                 # apply most recent, keep in list
git stash apply stash@{1}       # apply a specific stash by index
git stash drop stash@{1}        # delete a specific stash
git stash clear                 # delete ALL stashes

git stash show stash@{0}        # summary
git stash show -p stash@{0}     # full diff

# Create a temporary commit
git add -A
git commit -m "WIP: do not merge"

# When you come back, undo it
git reset HEAD~1    # keeps your changes unstaged

git stash push -m "WIP: user auth - mid refactor"
git status    # confirm working directory is clean

git switch main
git pull      # make sure you have the latest production code

git switch -c hotfix/fix-login-crash

# Make the fix
git add path/to/fixed-file.cs
git commit -m "fix: prevent null ref crash on login page"
git push -u origin hotfix/fix-login-crash

git switch feature/user-auth
git stash pop                    # restore your WIP changes
git rebase origin/main           # replay your feature commits on top of the hotfix

git log --oneline origin/main..HEAD    # shows commits on your branch not yet in main

git rebase -i HEAD~5    # replace 5 with your actual commit count

pick a1b2c3d feat: add login page skeleton
pick b2c3d4e WIP
pick c3d4e5f fix typo
pick d4e5f6a actually fix it
pick e5f6a7b add tests

pick a1b2c3d feat: add login page skeleton
s b2c3d4e WIP
s c3d4e5f fix typo
s d4e5f6a actually fix it
s e5f6a7b add tests

feat: add login page with form validation and unit tests

git push --force-with-lease