--- title: Fearless Rebasing | daily.dev description: GitButler 0.13 introduces 'fearless rebasing', inspired by Jujutsu's first-class conflicts concept. Unlike standard Git, which halts on conflicts during... canonical: https://daily.dev/posts/fearless-rebasing-1rsge1dcn twitter:card: summary_large_image twitter:site: @dailydotdev og:type: website og:site_name: daily.dev og:title: Fearless Rebasing | daily.dev og:description: GitButler 0.13 introduces 'fearless rebasing', inspired by Jujutsu's first-class conflicts concept. Unlike standard Git, which halts on conflicts during... og:url: https://daily.dev/posts/fearless-rebasing-1rsge1dcn og:image: https://api.daily.dev/og/posts/1rSGe1Dcn.png og:image:alt: Fearless Rebasing og:image:width: 1200 og:image:height: 630 og:locale: en --- > ## Documentation Index > Fetch the complete documentation index at: https://daily.dev/llms.txt > Use this file to discover all available pages before exploring further. # Fearless Rebasing **[GitButler Blog](https://daily.dev/sources/gitbutler)** · 6 min read · 0 upvotes · 0 comments ## Summary GitButler 0.13 introduces 'fearless rebasing', inspired by Jujutsu's first-class conflicts concept. Unlike standard Git, which halts on conflicts during rebase, GitButler always completes the rebase operation by marking conflicted commits with a special header and only applying non-conflicting hunks to the working directory. Developers can then resolve conflicts one at a time, in any order, and even continue making new commits while some commits remain in a conflicted state. This approach aims to make rebasing less painful and more accessible, enabling cleaner linear history without the traditional frustration of conflict-driven interruptions. ## Full article daily.dev links to this article rather than hosting it. Read it at the original source: ## Similar posts on daily.dev - [Git Rebase for the Terrified](https://daily.dev/posts/git-rebase-for-the-terrified-ynroja8em) · Hacker News · 1 upvotes · 0 comments - [git rebase -i is not that scary](https://daily.dev/posts/git-rebase--i-is-not-that-scary-6h0zn0hc1) · Lobsters · 2 upvotes · 0 comments - [GitButler 0.22 - "Catch 22"](https://daily.dev/posts/gitbutler-0-22---catch-22--hlxv8uu5e) · GitButler Blog · 7 upvotes · 0 comments - [Speeding up interactive rebase in JetBrains IDEs](https://daily.dev/posts/speeding-up-interactive-rebase-in-jetbrains-ides-7pxrdbzbs) · JetBrains · 16 upvotes · 0 comments --- Tags: [#git](https://daily.dev/tags/git), [#version-control](https://daily.dev/tags/version-control) [View this post on daily.dev](https://daily.dev/posts/fearless-rebasing-1rsge1dcn) ```json {"@context":"https://schema.org","@graph":[{"@type":"Organization","@id":"https://daily.dev/#organization","name":"daily.dev","url":"https://daily.dev","logo":{"@type":"ImageObject","url":"https://daily.dev/apple-touch-icon.png","width":180,"height":180},"sameAs":["https://twitter.com/dailydotdev","https://github.com/dailydotdev","https://www.linkedin.com/company/daily-dev-ltd"]},{"@type":"WebSite","@id":"https://daily.dev/#website","url":"https://daily.dev","name":"daily.dev","publisher":{"@id":"https://daily.dev/#organization"},"potentialAction":{"@type":"SearchAction","target":{"@type":"EntryPoint","urlTemplate":"https://daily.dev/search?q={search_term_string}"},"query-input":"required name=search_term_string"}}]} {"@context":"https://schema.org","@type":"TechArticle","headline":"Fearless Rebasing","url":"https://daily.dev/posts/fearless-rebasing-1rsge1dcn","mainEntityOfPage":{"@type":"WebPage","@id":"https://daily.dev/posts/fearless-rebasing-1rsge1dcn"},"datePublished":"2026-07-26T07:48:16.094Z","dateModified":"2026-07-26T07:48:59.307Z","description":"GitButler 0.13 introduces 'fearless rebasing', inspired by Jujutsu's first-class conflicts concept. Unlike standard Git, which halts on conflicts during...","image":"https://media.daily.dev/image/upload/f_auto,q_auto/v1/posts/5c77d14a2c13c3f6f5a9d999bf319bbd?_a=AQAEuop","thumbnailUrl":"https://media.daily.dev/image/upload/f_auto,q_auto/v1/posts/5c77d14a2c13c3f6f5a9d999bf319bbd?_a=AQAEuop","isAccessibleForFree":true,"articleSection":"GitButler Blog","inLanguage":"en","publisher":{"@type":"Organization","name":"daily.dev","url":"https://daily.dev","logo":{"@type":"ImageObject","url":"https://daily.dev/apple-touch-icon.png","width":180,"height":180}},"author":{"@type":"Organization","name":"GitButler Blog","logo":"https://media.daily.dev/image/upload/s--LrHsyt2T--/f_auto/v1692632054/squad_placeholder_sfwkmj","url":"https://daily.dev/sources/gitbutler"},"commentCount":0,"discussionUrl":"https://daily.dev/posts/fearless-rebasing-1rsge1dcn","interactionStatistic":[{"@type":"InteractionCounter","interactionType":{"@type":"LikeAction"},"userInteractionCount":0},{"@type":"InteractionCounter","interactionType":{"@type":"CommentAction"},"userInteractionCount":0}],"keywords":"git,version-control","timeRequired":"PT6M"} {"@context":"https://schema.org","@type":"BreadcrumbList","itemListElement":[{"@type":"ListItem","position":1,"name":"Home","item":"https://daily.dev"},{"@type":"ListItem","position":2,"name":"GitButler Blog","item":"https://daily.dev/sources/gitbutler"},{"@type":"ListItem","position":3,"name":"Fearless Rebasing"}]} ```