search

chaunmt / Interactive-Prerequisite-Flowchart

https://course-flowchart-drab.vercel.app
1 stars 0 forks source link

Rebase (dev should never be behind main) #45

Closed jahndan closed 7 months ago

jahndan commented 7 months ago

the only merge conflict here is README.md, which it's not letting me edit to resolve

chaunmt commented 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.