~/talk

Jujutsu and the End of Rebase Fear!

TalkinFrenchat Devoxx France 2026 · 2026-04-22..04-24· [developer-experience]
slides:none on file

An introduction to Jujutsu (jj), a modern version-control tool that makes rewriting, reorganizing and editing history safe, explicit and reversible to remove the fear of rebasing. The talk explains how to adopt jj alongside Git without changing existing workflows, and demonstrates the tool to show improvements in developer flow, confidence and delivery performance.

AI-written summary · about

  1. 0:00Jujutsu and rebases intro
  2. 1:08Rebase conflict demo
  3. 3:31Conflict resolution
  4. 5:15Bookmarks in Jujutsu
  5. 7:03Commit reordering
  6. 9:15Dev experience benefits
  7. 10:19AI agents vs conflicts
  8. 11:22Compatibility and adoption
  9. 12:28Advanced features
  10. 13:37Conclusion & Q&A
~/search
type to search 6,249 conferences, 138,987 speakers and 185,172 talks
~/help
cmdctrl k
search every conference, speaker and series
/
focus the filter search
h
home
c
conferences
s
speakers
e
series
t
light / dark — the status bar button does the same
?
this help
esc
close this, then clear every filter — or just the search, while you are typing in it

Ignored while you are typing. Pages without a filter rail have no search to focus.