@jwakely, this looks reasonable (although it clutters the presentation).

Note that the emplace() in concat_view's specification has the template keyword, so this PR should help with consistency.

We still need a rebase + force-push.

Something odd happened with the rebase; we now have 6k lines changes in containers.tex which shouldn't be in this patch. And we have 10 commits.

Again, please squash all the changes you want to have in this pull request (and nothing else) to a single commit and force-push. "git rebase -i main" might help.

Sorry, I think I messed up.

Because I always submit PRs on the git web page, I haven't actually used git locally for a long long time, so I need to recall these steps. (I've never squash or rebase PRs because I'm not familiar with it, sorry about that. I mostly use perforce system.)

"This branch has conflicts that must be resolved"

"This branch has conflicts that must be resolved"

Thanks for the pointers.
Now I think these conflicts should be resolved. The current question is how do I merge those disorganized 13 commits into 1 commit online?

@jwakely, could you please have a look?

Also, this MUST be squashed when merging. The commit history is ... frightening.

I'm not sure why github thinks it needs rebasing, it squashes cleanly for me.

Something like this:

git checkout -b pr/5455 origin/main
git fetch  https://github.com/hewillk/draft main-2
git merge --squash FETCH_HEAD
git commit
git push --force git@github.com:hewillk/draft.git  HEAD:main-2

Hmm, except that has spurious unrelated changes. What did you do?!

Hmm, except that has spurious unrelated changes. What did you do?!

I don't know, I just did something terrible that I can't remember. I may have rebase the wrong branches or something, or reset something wrong or something. Anyway, I'm sorry for the unspeakable clutter.

And, again, thanks for the instant redemption.

What I did was:

git checkout -b pr/5455 origin/main
git fetch  https://github.com/hewillk/draft main-2
git merge --squash FETCH_HEAD
git checkout HEAD -- lib-intro.tex threads.tex time.tex # drop the unwanted changes
git commit # and remove all the unrelated cruft in the commit message
git push --force git@github.com:hewillk/draft.git  HEAD:main-2

It probably would have been easier to just do:

git checkout main
git cherry-pick 573319cc006a3082128d240494efdf8eb2f46cd0

i.e. just cherry-pick the one good commit from that messy series of 13 commits. Then force-push that to main-2