| 1 |
Checkout your feature branch |
git checkout your-feature-branch |
Branches panel → highlight your branch → press enter |
| 2 |
Stage only Makefiles |
git add Makefile tests/Makefile |
Files panel → select Makefile and tests/Makefile → press space |
| 3 |
Commit staged Makefiles |
git commit -m "Update root and tests Makefiles" |
Commit panel → press c → type message → press enter |
| 4 |
Switch to main |
git checkout main |
Branches panel → highlight main → press space |
| 5 |
Pull latest main |
git pull origin main |
Fetch/Pull panel → press p |
| 6 |
Cherry-pick Makefile commit |
git cherry-pick <commit-hash> |
Log panel → navigate to your commit → press c (cherry-pick) → resolve conflicts if any |
| 7 |
Push updated main |
git push origin main |
Branches panel → highlight main → press P → then p (push) |