Git Workflow Cheat Sheet

# Add the original repository as an upstream remote (Do this only once)
git remote add upstream REPO_URL

# Fetch the latest changes from the original repository
git fetch upstream

# Switch to your local main branch
git checkout main

# Merge the changes from the original main branch into your local main branch
git merge upstream/main

# Push the updated local main branch to your forked repository on GitHub
git push origin main

# Fetch the latest state of the remote branches
git fetch origin

# Switch to the branch you want to reset (replace <branch> with your branch name)
git checkout <branch>

# Force reset your local branch to exactly match the remote branch
git reset --hard origin/<branch>

# Ensure you are on the main branch (you can use either checkout or switch)
git checkout main
# OR
git switch main

# Make sure your main branch is up to date
git pull origin main

# --- Bring the file from the other branch (Choose ONE of the two methods below) ---

# Method A: Using checkout
git checkout V2P -- path/to/your_file.py

# Method B: Using restore (Newer, recommended approach)
git restore --source=V2P path/to/your_file.py

# Add the file to the staging area
git add path/to/your_file.py

# Commit the new file to your current branch
git commit -m "Bring finished file from V2P"

# Push the changes to GitHub
git push origin main