Shared flowchart

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

Sign in to clone
by @openstemUpdated Software
git pull / git mergeConflicting changes?✅ Merge completes automatically⚠️ Conflict markers added to filesEdit files, choose/combine changesgit add resolved files🔀 git commit to complete mergeNoYes

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