Git conflict staging explicit paths

Always stage explicit paths when resolving Git conflicts; never use git add -A, which can silently include generated, unrelated, or sensitive files. Stage .lore.md explicitly with git add .lore.md, commit it on the PR branch with a chore message, and never stash it; resolve rebase conflicts one named path at a time.