Git Workflow Zen: Finding Peace in Version Control

 1# Instead of this:
 2git commit -m "fix stuff"
 3
 4# Try this:
 5git commit -m "Fix user authentication timeout issue
 6
 7- Increase session timeout from 30min to 2hrs
 8- Add proper error handling for expired tokens
 9- Update user notification when session expires
10
11Resolves #142"

 1# Good: Separate concerns
 2git add user-auth.js
 3git commit -m "Add password strength validation"
 4
 5git add user-profile.css
 6git commit -m "Update profile page styling for mobile"
 7
 8# Avoid: Mixed concerns in one commit
 9git add .
10git commit -m "Various fixes and updates"

 1# Feature branches
 2feature/user-dashboard-redesign
 3feature/payment-integration
 4feature/dark-mode-toggle
 5
 6# Bug fixes
 7fix/login-redirect-loop
 8fix/mobile-navigation-overlap
 9hotfix/critical-security-patch
10
11# Experiments
12experiment/new-search-algorithm
13spike/performance-optimization

1# Instead of: "This is wrong"
2# Try: "Have you considered using a Map here? It might be more efficient for lookups."
3
4# Instead of: "Bad naming"
5# Try: "Could we make this variable name more descriptive? Maybe `userAuthToken` instead of `token`?"
6
7# Instead of: "This won't work"
8# Try: "I think this might cause issues when the array is empty. What do you think about adding a length check?"

1git checkout main
2git merge feature/quick-fix
3# Results in a clean, linear history

1git checkout main
2git merge --no-ff feature/complex-feature
3# Creates a merge commit that shows the feature branch history

1git checkout main
2git merge --squash feature/multiple-small-fixes
3git commit -m "Implement user notification system
4
5- Add email notifications
6- Add in-app notifications
7- Add notification preferences
8- Update user settings UI"

 1# When conflicts arise
 2git status  # See what's conflicted
 3git diff    # Understand the differences
 4
 5# After resolving
 6git add resolved-file.js
 7git commit -m "Resolve merge conflict in user authentication
 8
 9Combined the new validation logic with the existing error handling.
10Tested with both happy path and edge cases."

 1#!/bin/bash
 2# morning-git-ritual.sh
 3
 4echo "🌅 Starting the day with clean Git practices..."
 5
 6# Update main branch
 7git checkout main
 8git pull origin main
 9
10# Clean up merged branches
11git branch --merged | grep -v main | xargs -n 1 git branch -d
12
13# Check for any uncommitted changes
14if [[ -n $(git status --porcelain) ]]; then
15    echo "⚠️  You have uncommitted changes. Don't forget to commit them!"
16    git status --short
17fi
18
19echo "✨ Ready for a productive day!"

 1#!/bin/bash
 2# evening-git-ritual.sh
 3
 4echo "🌙 Wrapping up the day..."
 5
 6# Show what you've accomplished
 7echo "Today's commits:"
 8git log --oneline --since="1 day ago" --author="$(git config user.name)"
 9
10# Remind about uncommitted work
11if [[ -n $(git status --porcelain) ]]; then
12    echo "💭 Don't forget to commit your work:"
13    git status --short
14fi
15
16echo "🛌 Sweet dreams, and may your merges be conflict-free!"

 1# Clean up your last 3 commits
 2git rebase -i HEAD~3
 3
 4# In the editor:
 5pick abc1234 Add user authentication
 6squash def5678 Fix typo in auth function
 7reword ghi9012 Update user model
 8
 9# This becomes:
10pick abc1234 Add user authentication with proper validation
11pick ghi9012 Enhance user model with security improvements

 1#!/bin/sh
 2# .git/hooks/pre-commit
 3
 4echo "🔍 Running pre-commit checks..."
 5
 6# Run linter
 7npm run lint
 8if [ $? -ne 0 ]; then
 9    echo "❌ Linting failed. Please fix the issues before committing."
10    exit 1
11fi
12
13# Run tests
14npm test
15if [ $? -ne 0 ]; then
16    echo "❌ Tests failed. Please fix the failing tests before committing."
17    exit 1
18fi
19
20echo "✅ All checks passed. Proceeding with commit."

 1# "I committed to the wrong branch"
 2git log --oneline -n 1  # Note the commit hash
 3git reset HEAD~1        # Undo the commit (keep changes)
 4git checkout correct-branch
 5git add .
 6git commit -m "Your commit message"
 7
 8# "I need to undo my last commit"
 9git reset --soft HEAD~1  # Keeps changes staged
10git reset --mixed HEAD~1 # Keeps changes unstaged
11git reset --hard HEAD~1  # Removes changes entirely (be careful!)
12
13# "I accidentally deleted a branch"
14git reflog              # Find the commit hash
15git checkout -b recovered-branch <commit-hash>