Today's extra knowledge won as one coauthor pointed out that I really need to get rid of the superscript references used as words like βinΒΉ, they discovered thatβ¦β (my supervisor wrote that and I found it ugly but didn't know how to do better):
Textual citations are a thing! "\citet" in bibtex and "\textcite" in biblatex, prints βin Author et al.ΒΉβ
Rambling about trying to do a manual n-way merge
Apparently some people were wondering the same thing as me 10 years ago but never found anything better eitherβ¦
Maybe I'm just overcomplicating and it's easier to do a 3-way merge, merging two modified versions at a time with my original as reference.
Or even just one at a time since I still have my original as a commit even if not as a separate branch. Erk, and I though I mostly knew how to use git
Rambling about trying to do a manual n-way merge
Welp, actually octopus merges don't do what I want, they only work as long as there is no conflict (and I want to be able to review and compare conflicts, also edit manually the result while I merge).
Diffuse does do what I want (with something like "diffuse -r main -r person1 -r person2 -r person3 paper.tex") but it's graphical and each file has its own column so I can only read a couple of words at a time.
I guess I continue looking
For a first try I'm quite happy of the way I found to handle comments on my paper draft.
They sent back the annotated pdf, so I extracted the annotations with pdfannots and replaced the bullet points to get an org-mode list with checkboxes. I put both in a new git branch, implemented the requested changes on this branch, and once I have everybody's comments implemented I'll attempt an octopus merge so I can see where they are incompatible instead of replacing one person's comments by the next's.
So totally forgetting some task exists is what happens when I don't enter it in my org agenda
Covid travel rules
I didn't write it down so I totally forgot there were rules to enter Germany again, but I think I got everything now
I panicked at the announcement in the train that (not self-made, this I had) tests were mandatory but luckily the proof of vaccine was enough, and luckily too I found wifi for the entry registration.
Now I'm all set, no quarantine necessary, appointment for the booster obtained, new self-test made just to be sure, I can go get groceries, yay!
Will I ever discover whether or not I have ADHD, the adventure
I caught up with my sister for the first time in 2-ish years, it turns out she got diagnosed with ADHD and some form of autism. And her therapist thinks like mine that our father likely is autistic, from what we tell about him. I often heard that both are linked and run in families, so that's interesting to report when I get an appointment mid-January.
I really thought I wouldn't be able to travel because the test station where I had made a last-minute appointment after work yesterday had closed early (I guess before I did the online appointment? ), so I had to rush home to look up any station still open after 7pm. Found one more than an hour away, made it before it closed and got smoothly tested, but I was afraid for a moment.
Next time I'll just go there during work as soon as it's less than 24h before arrival
German unemployement adventures
I'm still missing paperwork since the HR people who can fill them were already in holidays when I got them, so anyway I'm not losing anything by not being home. But still, why would it be bad to register an absence more than a week in advance, I don't get it
German unemployement adventures
If I'm going to not be able to empty my letterbox minimum once a day I have to ask the authorization first (which is already some ironic double-standard because their invitation letter to Thursday's appointment took a week and arrived after the appointment).
So I tried to register that I will still be away for a couple of days when my unemployment start, but I can't do that. They write that I ask for an absence more than 7 days in advance, it won't be approved.
Trans catboy
Sleepy physicist
Watching potatoes grow
Trying to draw