Shared note

Software · L2 · Git & Dev Workflow: Resolving a Merge Conflict

Sign in to clone

What the conflict markers Git inserts actually mean, and the exact steps to resolve and complete a conflicted merge.

by @openstemUpdated Software

We use privacy-friendly product analytics (no session recording, PII masked) to improve OpenStem. Load analytics? Privacy Policy