Git Workflow HOWTO

# Git Workflow HOWTO (Linux CLI)
## 1. Check status
# See which files are modified, staged, or untracked
git status

## 2. Add files
# Add a single file
git add <filename>
# Example:
git add test.asm

# Add all new and modified files
git add .

## 3. Commit changes
# Commit staged files with a descriptive message
git commit -m "Describe your changes here"

## 4. Push changes to GitHub
# Send your commits to the remote main branch
git push origin main
# Note: If you get "non-fast-forward" errors, pull first:
# git pull origin main

## 5. Pull changes from GitHub
# Fetch and merge changes from remote main branch
git pull origin main

## 6. Check commit history
# See a concise, graphical log of commits
git log --oneline --graph --all

## Tips:
# - Stage often, commit when a logical piece of work is complete.
# - Pull frequently to avoid conflicts with remote changes.
# - If conflicts occur, resolve manually, then:
#   git add <file>
#   git rebase --continue   # if rebasing
#   OR
#   git commit              # if merging

# Example workflow:
# 1. git pull origin main
# 2. make changes
# 3. git add .
# 4. git commit -m "Update bigfoot.asm logic"
# 5. git push origin main

# Git Workflow HOWTO (Linux CLI)
## 1. Check status
# See which files are modified, staged, or untracked
git status

## 2. Add files
# Add a single file
git add <filename>
# Example:
git add test.asm

# Add all new and modified files
git add .

## 3. Commit changes
# Commit staged files with a descriptive message
git commit -m "Describe your changes here"

## 4. Push changes to GitHub
# Send your commits to the remote main branch
git push origin main
# Note: If you get "non-fast-forward" errors, pull first:
# git pull origin main

## 5. Pull changes from GitHub
# Fetch and merge changes from remote main branch
git pull origin main

## 6. Check commit history
# See a concise, graphical log of commits
git log --oneline --graph --all

## Tips:
# - Stage often, commit when a logical piece of work is complete.
# - Pull frequently to avoid conflicts with remote changes.
# - If conflicts occur, resolve manually, then:
#   git add <file>
#   git rebase --continue   # if rebasing
#   OR
#   git commit              # if merging

# Example workflow:
# 1. git pull origin main
# 2. make changes
# 3. git add .
# 4. git commit -m "Update bigfoot.asm logic"
# 5. git push origin main

Addlestone, United Kingdom

Fog

1.3 °C

17-12-2025 06:42