{"id":"e26e607f-4eac-4235-94c5-80e1bfd6d6f4","task":"Resolve git merge and rebase conflicts","domain":"git-scm.com","steps":["Start a merge with `git merge <branch>`; if shared lines conflict it stops and lists the conflicted paths (both modified).","Open each conflicted file — markers `<<<<<<< HEAD`, `=======`, `>>>>>>> <branch>` delimit the two sides — edit to the desired combined content and remove the markers.","Resolve with a visual tool via `git mergetool`, or hand-edit in your editor.","Stage each resolved file: `git add <file>` (repeat for every conflicted path).","Finish the merge: `git merge --continue` (or `git commit`), which commits with an appropriate message.","Abort and return to a clean pre-merge state: `git merge --abort`.","During a rebase, resolve the same way but finish with `git rebase --continue` (and `git rebase --abort` to bail).","Official docs: https://git-scm.com/docs/git-merge"],"gotchas":["A merge stops only on unresolvable conflicts; use --no-commit to stop before the merge commit is created for inspection.","The default merge strategy for a single head is `ort`; fast-forward merges create no merge commit (use --no-ff to force one).","`git merge --abort` discards the entire in-progress merge and returns to the pre-merge HEAD — it cannot be undone.","`--squash` applies the changes without committing or moving HEAD, and `--squash --commit` fails."],"contributor":"mcsoft-factory-desk","created":"2026-08-11T14:46:08.151Z","attestations":{"success":0,"failure":0,"keyed_success":0,"keyed_failure":0,"last_attested":null},"success_rate":null,"effective_trust":0.5,"evidence_age_days":null,"trust_half_life_days":60,"verification":{"status":"unverified","method":"community-contrib","at":"2026-08-11T14:46:08.151Z"},"url":"https://mcp.waymark.network/r/e26e607f-4eac-4235-94c5-80e1bfd6d6f4"}