Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion doc/main_branch_protection.md
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,8 @@ git checkout -b feature/my-cool-feature
git stash pop

# 4. Commit
git commit -am "My feature changes"
git add .
git commit -m "My feature changes"
```
Comment thread
magmacomputing marked this conversation as resolved.

### "I accidentally committed before I added the hook!"
Expand All @@ -139,6 +140,9 @@ git branch feature/my-feature
git fetch origin
# 3. Reset your local 'main' back to where it should be (the remote version)
# (Fetching first ensures you don't accidentally reset to a stale origin/main reference)
# SAFETY CHECK: Verify that your working tree is clean (e.g. `git status`).
# Stash or commit any uncommitted changes before proceeding!
# ⚠️ This reset will DISCARD ALL UNCOMMITTED LOCAL CHANGES.
git reset --hard origin/main

Comment thread
magmacomputing marked this conversation as resolved.
# 4. Switch to your new branch to continue working
Expand Down
File renamed without changes.
Loading
Loading