Closed jahndan closed 7 months ago
the only merge conflict here is README.md, which it's not letting me edit to resolve
Fixed. The way to do it is to delete all the "=====>branch_name" and "<=====branch_name" and keep only the contents you want.
the only merge conflict here is README.md, which it's not letting me edit to resolve