4 posts tagged with "git"

Version control with Git offers developers multiple ways to integrate changes across branches, with merge and rebase standing as the two primary approaches. While both accomplish the same fundamental goal—incorporating changes from one branch into another—they do so through fundamentally different mechanisms, resulting in distinct commit histories and team workflows. Understanding when to use each strategy can significantly impact your project's history clarity, team collaboration, and conflict resolution process. In this deep dive, we'll explore how each option works under the hood, examine real-world usage patterns, and provide clear guidelines for choosing the right approach for your specific situation.

Oops! That was a mistake​

Sometimes you accidentally add a file to your repository that you don't want. It happens to all of us. Usually, it's not that big of a deal, but it can be a problem when you commit something dangerous, such as API keys, passwords, or other sensitive information.

So you've just come back from vacation and what to see what your co-workers have been up to? Coming back to a project after a long break? There is a little-known command in git that will show you all the commits that have happened since you left off.

Sometimes one needs to grab a copy of your source repo at a specific point in time. This is the command to do so. Update the date and branch (e.g dev) according to your needs.