start pathways post, add logos image w prereview to events page

[netlify[bot]]

✅ Deploy Preview for dreamy-solstice-e71879 ready!

Name	Link
🔨 Latest commit	e2e9cc2aedff8d2c345b5963c001f0bc4a099e0d
🔍 Latest deploy log	https://app.netlify.com/sites/dreamy-solstice-e71879/deploys/65aec008e99cb500088c15dd
😎 Deploy Preview	https://deploy-preview-85--dreamy-solstice-e71879.netlify.app
📱 Preview on mobile	Toggle QR Code... Use your smartphone camera to open QR code link.

---

To edit notification comments on pull requests, go to your Netlify site configuration.

[jules32]

Hi @stefaniebutland ! I'm working on the newsletter and added an edit to the opening sentences above :)

[stefaniebutland]

@jules32 Can you please help resolve conflicts and publish?

I tried but am stumped; burning it down & recloning did not resolve. I think because it's the _site/ files. Weak mental model on my part. Not sure whether I need to accept head or base branch of each and how to choose them on cmd-line in the screenshot.

[stefaniebutland]

Julie's advice

I would delete the _site files until you can successfully resolve conflict (don’t try to go line-by-line through .html files, just delete them. Then, after you’ve successfully merged without conflict, rebuild the site and push any new files.

Was still stumped. Going to reclone, create new branch for this post, add the index.qmd and logos image, render, push.

note to self: figure out and practice the commands in RStudio to update my older branch with what has been pushed to Main. Just clicking pull in git tab does not accomplish this

[stefaniebutland]

merged in new branch, new PR to work around merge conflicts https://github.com/Openscapes/website-new/pull/87