4-logic-basics - Githubissues

agnacore / Spaceship

1 stars 1 forks source link

4-logic-basics #16

Open agnacore opened 9 months ago

agnacore commented 9 months ago

we have conflicts, but I think it's fine for now since this isn't nearly complete

c-m-green commented 8 months ago

This was my wake-up call that I didn't have email notifications on for this repo. Oops...

c-m-green commented 8 months ago

we have conflicts, but I think it's fine for now since this isn't nearly complete

Hmm...nothing in here looks as though it ought to cause conflicts. No massive shifting of code blocks, no weird list insertion shenanigans with commas, etc...

Oh wait, just noticed -- here's your problem: You forgot to git fetch and/or git rebase <remote-name>/main

rebase