Did you know?.. When merging 2 divergent branches in Git, you perform a Recursive (or 3-Way) Merge. This involves the two branch tips and the common ancestor. This video shows you what that looks 👀 like.
Merge conflicts can show up when you do a ‘git-merge’ or a ‘git-rebase’: One way you can “anticipate” a git merge is with the ‘diff’ command Here’s some bash pseudo code using command substitution: Remember though ☝️ A diff will always yield results, that’s what a patch is.. The key is when the SAME LINESContinue reading “Git Merge Conflicts”
If you don’t understand this fundamental concept, then nothing in Git (or Github) will ever make sense.