merge-conflicts

To resolve git merge conflicts without losing work, you must list unmerged paths, classify each conflict as Trivial, One-side, Combinable, or Semantic, and apply the matching resolution strategy file-by-file. This ensures both sides of the merge are evaluated before staging.

The best way to handle merge conflicts in lock files and generated code is through special-case handling during your incremental resolution workflow. You categorize these specific file types separately to prevent broken dependencies or overwritten generated outputs.

To safely eliminate conflict markers during a git rebase, resolve conflicts incrementally and stage each file immediately with git add. You must verify the complete absence of marker strings across source files before proceeding with the build.

Classifying conflict types before staging in version control dictates your resolution strategy and prevents accidental data loss. By sorting conflicts into Trivial, One-side, Combinable, or Semantic categories, you apply the correct safe edits for each specific scenario.

Yes, you need to run pnpm build after resolving all git conflicts to verify the integrity of your code. Running the build confirms that conflict markers are completely gone and that your safe edits did not break the project compilation.

Yes, you can use this incremental conflict resolution workflow for Supabase migrations because it includes special handling for these files. The process ensures migration conflicts are categorized and resolved safely alongside your standard source code.