Author Archives: raylech1986it

Git Merge Conflicts

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”

Git Rebase Lesson

I wrote a script to automate the creation of two divergent git branches…’main’ and ‘feature’. When I rebased ‘feature’ onto ‘main’..no worked was “saved”. The following code: even show ‘noop’ in the text editor. Turns out, my code was creating duplicate patches on each divergent branch (here’s how to reproduce it if your interested, githubContinue reading “Git Rebase Lesson”