| Home | https://masalmon.eu/ |
| GitHub | https://github.com/maelle |
| Pronouns | She/her |
| Profile pic by | Julie Noury Soyer https://photographe-julienourysoyer.com/index.php |
New post! Better Git diff with difftastic by @wilfredh
A diffing tool that understands syntax and can
- ignore formatting changes
- match delimiters in wrappers
- ...
Today, I gave a talk about what to replace git checkout with:
🌳 git switch to change branches
↩️ git restore to restore a file to a given state
Including demos of the commands with {saperlipopette}
Yesterday I got to present what I painstakingly learnt about
✨ extending roxygen2 ✨
New post: "Git commits: please mark your stitches!"
In which I share a crochet analogy for Git commits… 🧶
Fellow RefinedGitHub users!
Am I missing something or does the new GitHub "One-click merge conflict resolution" define current and incoming differently from the old corresponding RefinedGitHub feature?
- GitHub https://github.blog/changelog/2025-10-02-one-click-merge-conflict-resolution-now-in-the-web-interface/
- RefinedGitHub https://github.com/refined-github/refined-github/pull/8787/changes#diff-5a831ea67cf5cf8703b0de46901ab25bd191f56b320053be9332d9a3b0d01d15
Ouverture des inscriptions pour les Rencontres R 2026 à Nantes du 16 au 18 juin ! 🥳
Martes 2/12 @latinr_conf con @yabellini 😎
¡Miércoles, Git! Manejo de errores en Git y no morir en el intento
Cómo no entrar en Vim si no querés, coregir commits, deshacer cambios, mover commits de una rama a otra, máquina del tiempo de Git.
Just got back from the great uRos (The Use of #RStats in Official Statistics) 2025 conference in Bucharest. 🇷🇴 🙏
- My Git tutorial "Painlessly Improve Your Git History" https://masalmon.eu/talks/2025-11-24-git-history/
- My keynote talk "R Packages, good vibes only" https://masalmon.eu/talks/2025-11-25-r-packages-good-vibes/
The next uRos conference will take place in Paris in November 2026, organized by INSEE. 🇫🇷
