search

gitext-rs / git-stack

Stacked branch management for Git
Apache License 2.0
508 stars 19 forks source link

fix(git): Don't panic on conflict #98

Closed epage closed 2 years ago

epage commented 2 years ago

Unsure what the case is where there isn't a ours or theirs.

Fixes #95