Menu
Safely resolves git conflicts and ensures successful pushes during autonomous sessions. Use when git pull --rebase fails.
Install with Codex or Claude Copy this prompt, paste it into Codex, Claude, or another assistant, and let it review the skill page and install it for you.
Based on SOC occupation classification
Procedural guidance on safely auditing, modifying, and cleaning up Beeminder goal data (including odometer resets, @TARE mechanics, and timezone protections) without risking accidental derailment. Triggers on keywords like beeminder audit, beeminder cleanup, delete datapoints, tare.
Maintain project health through intentional pruning, context hygiene, and rigorous validation of multilingual accountability features. Trigger with /bonsai-orient
Serialize session state after work is complete. Closes the plan issue, updates NEXT_SESSION.md, appends to SESSION_LOG, and commits. Handles partial completion honestly. The on-save arm. Trigger with /mecris-archive
Write a minimal spec as a GitHub issue before acting. Takes the recommended action from mecris-orient and records intent, rationale, and validation criteria. This is the red in red-green-archive. Trigger with /mecris-plan
Manage the synchronization and IP separation between the public talktype-repo and the internal Urmanac mirror. Use when developing features across public and internal boundaries, ensuring Urmanac-specific context remains isolated while generic improvements are shared.
Test-Driven Generation uses TDD (Test-Driven Development) techniques to generate tests and code in Red-Green-Refactor loops. Key words to detect are tdg, TDG.
| name | Mecris Rebase |
| description | Safely resolves git conflicts and ensures successful pushes during autonomous sessions. Use when git pull --rebase fails. |
Guided workflow for resolving git conflicts when upstream changes interfere with an autonomous push.
Identify which files are in "both modified" state.
git status
For each conflicted file:
read_file or grep to see the conflict markers (<<<<<<<, =======, >>>>>>>).session_log.md, NEXT_SESSION.md), merge the information from both.theirs) unless the bot's task specifically required a fix in that spot.git checkout --ours <file> or git checkout --theirs <file> for clean binary/full-file choices.git add <file>NEVER continue a rebase without verifying the build and tests.
cd mecris-go-project && ./gradlew assembleDebug.PYTHONPATH=. .venv/bin/pytest.git rebase --continue (or git merge --continue).git log --oneline -5.git push origin main.session_log.md about the conflict resolution.Use when: "push failed", "git conflict", "rebase failed", "diverged branches".
"Conflict resolved and changes pushed to main. History is now synchronized."