Results for “conflict-resolution”

3 skills

Learn Git workflow patterns including branching strategies, commit conventions, merge vs rebase, conflict resolution, and collaborative development best practices for teams of all sizes.

More results

Migrate .NET projects from per-project package versioning to NuGet Central Package Management (CPM) using Directory.Packages.props, with baseline build capture, version conflict resolution, and post-conversion validation.

brycewang-stanford

Takes a proofread or apsa-style report file (or any markdown file using **Original:** / **Recommended:** syntax) and rewrites the original source file with git merge conflict markers so the user can accept or reject each suggested edit using VS Code or Positron's built-in merge conflict UI. Branch names are "original" and "claude-edits". Use when asked to apply edits, insert conflict markers, or set up merge resolution for a copy-edit report. Supports an optional @sec-label argument to restrict markers to one section.