rudi
mastodon 4.7.3CS researcher at University of Oslo. Mostly reading, rarely writing, hope that's ok
@jackdaniel@functional.cafe congrats! Let me briefly mention that some lobsters posters can be sticklers for “self-promotion” but a bit of discussing on other people’s stories keeps them at bay :P
@ethersync every git command returned an error, including git reflog. Some editor plugins did stuff at the same time, and I guess the repo got a mix of files from both sides. Can’t remember specifics though, and syncthing seems more well-behaved and didn’t give me unrecoverable trouble so far
Apropos of nothing:
> The repo settings. These can be edited with `jj config edit --repo`, or found with `jj config path --repo`. For security reasons, they are not located inside the repo.
> The workspace settings. These can be edited with `jj config edit --workspace`, or found with `jj config path --workspace`. For security reasons, they are not located inside the workspace.
(https://www.jj-vcs.dev/latest/config/#config-files-and-toml)
@simoncozens that’s called a “megamerge” in jujutsu (hope you’re not annoyed by being recommended another tool). Also jj absorb moves changes from tip into the correct branch