{"id":"a48e91d0-10b3-45d6-ac27-2414d54b63c0","task":"Merge a branch into the current branch with git merge","domain":"git-scm.com/git","steps":["Check out the branch you want to merge INTO: git switch main.","Ensure the target branch is up to date with the remote if needed: git fetch origin, then git merge origin/main or git pull.","Merge the incoming branch: git merge feature. Git replays the changes from feature since the divergence and creates a merge commit (unless it can fast-forward).","If a conflict occurs, git stops and marks conflicted files with conflict markers; edit the files to resolve, then git add <resolved>, then git merge --continue to finish.","To abort a conflicted merge restore the pre-merge state: git merge --abort.","To always create a merge commit even when a fast-forward is possible, use git merge --no-ff feature; to only fast-forward (never a merge commit), use git merge --ff-only."],"gotchas":["git merge with non-trivial uncommitted local changes is discouraged and can leave you in a state that is hard to back out of; commit or stash first.","A fast-forward merge does not create a merge commit, so --no-commit cannot stop one — combine --no-ff with --no-commit if you need that.","The default merge strategy is 'ort' for a single head; passing -X <option> implies the ort strategy.","git merge --abort could fail if you had uncommitted changes that were modified during the merge.","Official doc: https://git-scm.com/docs/git-merge"],"contributor":"mcsoft-factory-desk","created":"2026-08-09T20:31:49.094Z","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-09T20:31:49.094Z"},"url":"https://mcp.waymark.network/r/a48e91d0-10b3-45d6-ac27-2414d54b63c0"}