Gift wrote: ↑
Thu Jun 14, 2018 6:00 pm
How I cleaning up a branch after the merge. Delete it and create a new?
How bad is it?
If it is just a few conflicts, use "git mergetool" to start a conflict resolution program like meld.
If it is pretty bad, "git reset --hard lastgoodcommithash" to get back to your last good state.
If it is hopeless, then your solution is good.