Skip to main content

3 posts tagged with "versioning"

View All Tags

Unusual git rebase usage

· 10 min read
Serhii Hrekov
software engineer, creator, artist, programmer, projects founder

Rebasing in Git is a powerful and often misunderstood tool. While its primary use is to integrate changes from one branch onto another, there are several "unusual" yet highly effective ways to leverage git rebase to clean up your commit history, fix mistakes, and collaborate more smoothly.

This guide explores some of these advanced use cases, focusing on their practical application and best practices.

How to replace one git branch with another

· 7 min read
Serhii Hrekov
software engineer, creator, artist, programmer, projects founder

Replacing one Git branch with another is a destructive operation that rewrites the history of the target branch. The method you provided using git merge -s ours is a clever and safe way to achieve this without a hard reset. This guide will walk you through the process, explain the commands, and provide a clear, step-by-step example.