https://www.compilemymind.com/tags/git/ Recent content in Git on Compile My Mind Hugo en Mon, 19 Oct 2026 12:10:35 +0300 https://www.compilemymind.com/posts/git-merge-vs-rebase/ Mon, 19 Oct 2026 12:10:35 +0300 https://www.compilemymind.com/posts/git-merge-vs-rebase/ <p>Your feature branch was current yesterday. This morning, <code>main</code> has six new commits, the pull request shows a fork in the road, and someone says, “Just rebase it.” Someone else says, “Never rebase—merge is safer.”</p> <p>Both pieces of advice are incomplete.</p> <p><strong>Git merge joins histories without replacing the commits that already exist. Git rebase takes selected commits, replays their changes on a new base, and creates new commits.</strong> Both can produce the same final files. They tell different stories about how those files arrived there.</p>