Conversation
✅ Deploy Preview for compilerla ready!
To edit notification comments on pull requests, go to your Netlify project configuration. |
|
merging #318 introduced a merge conflict here and #319 should really include the blog post we published in #301 anyway. as i see it we have two options, either of which feel reasonable:
i know @angela-tran has expressed (understandable) squeamishness about managing history in long-running branches. if there's a tack that y'all prefer, i will make it so. |
|
@jgravois - I was thinking about all this (the recent blog post merge into My thought on the immediate question is that Option 1 aligns the most with our convention to rebase rather than merge the base branch. So yep, option 1 was how I was thinking we should handle it. My thought on my past comments about managing history on long-lived branches is that those were more about how, if we're working on a feature branch with many interdependent changes coming in from different PRs, I would prefer that all those PRs target the feature branch, rather than some of them targeting I'll link to those comments in case it's helpful context for anyone:
In this case with compiler.la / the blog post, it was much more clear-cut that the blog post was totally independent of our 11ty refactor and needed to be deployed to the live site as soon as it was done. So in this case we have a rebase that cannot be avoided, and that's fine. That's how I view it at least. I'm happy to discuss this more if anyone disagrees with what I'm suggesting 🙏 |
|
thanks for the thorough write-up and including those links.
i'm all for avoiding rebases when possible. on that note, i'll wait to rebase this branch on top of |
That sounds good to me. Hopefully the merge conflicts aren't too bad when you get to the rebase 🤞 😅 🤗 |
|
Rebases… can't live with 'em, can't live without 'em; am I right? (I agree with the proposed course of action.) |
takes precedence over the UI config https://docs.netlify.com/build/configure-builds/file-based-configuration/
as a part of touching these Markdown files, VS Code also fixed some formatting
luckily they weren't bad 😉 |
closes #287
Steps to test
Open the two sites side-by-side and compare
TODO:Known discrepancies
<meta name="generator" content="Eleventy v3.1.6">tag.(not sure why we don't currently have a jekyll flavored variant, i was under the impression that it was injected automatically.
<meta name="og:title">and<meta property="og:description">tags are now injected more consistently<script src="https://static.cloudflareinsights.com/beacon.min.js...">tag. i assume this is injected by Cloudflare itself and will persist when the 11ty site is deployed, but will make a point of confirming.<link type="application/atom+xml" href="/blog/feed.xml">is an absolute url instead of a fully qualified domain name. i don't think that's problematic, but if anyone else disagrees, it'd be trivial to make it match.