Recent posts tagged merging

No, It's Not a Typo: Let's Talk About git rerere Reuse Recorded Resolution git rerere helps Git remember how you resolved a conflict previously, and automatically reuses that resolution when the same conflict occurs again. This can be a huge time-sa...

In the last story1, we created a new repository on GitHub and pushed our code to the main branch. In this one, let’s rewind a bit, I'll walk you through how to look back at your development history and test new features safely using Git. By now, you...

Let's imagine a scenario without Git first to see the problem, and then we'll see how branching and merging provide the perfect solution. The Problem: The "Single Shared Document" Nightmare Imagine you and a colleague let's call them Coder A and Co...