softprops / awesome-mdbook

🕶️🗃️ a card catalog of mdbooks for your reading curiosity
120 stars 17 forks source link

figure out system for avoiding merge conflicts #5

Open softprops opened 5 years ago

softprops commented 5 years ago

in the first two pulls a merge conflict was already introduced. this is unfortunate and annoying. how do other awesome lists deal with this???