Coding & Programming May 25, 2024
You have divergent branchesIntroduction When working with Git, you might encounter a situation where your local branch has diverged from its remote counterpart. This means that both branches have commits that are not in the other and this is called divergent branches. To reconcile these differences, you have a few options for how you want Git to handle […]
Read article
Coding & Programming May 12, 2024
Merge made by the ‘ort’ strategyIntroduction Git, the popular version control system, constantly evolves to improve performance and efficiency for developers. One such evolution is the introduction of the ORT (Ostensibly Recursive’s Twin) merge strategy in Git 2.33. In this blog post, we’ll delve into what ORT is, its benefits, and the considerations developers should keep in mind when using […]
Read article