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”
Author Archives: raylech1986it
How To Read Linux Permissions
Here I break down how to read and set Linux permissions in numeric and symbolic mode: ⬇️
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”
Git Merge | Fast Forward
Here’s how I visualize a Git *Fast Forward* Merge:
How To Combat Perfectionism
How To Read Crontab Files | Part 2
Part 2 takes what was introduced in Part 1 and expands upon it. I’ll show you how to create your own crontab file and some advanced syntax.
How To Read Crontab Files | Part 1
In Part 1 of this video, I’ll show you how to NEVER FORGET the format of a crontab file and how to read one: System-Wide Crontab File Man Page crontab(5) How To Read ANY COLUMN
Getting Started With VIM
This simple and effective introduction to VIM will help you see the big picture and avoid a lot of the common snags people new to VIM get caught by.
AlmaLinux comes to Windows Subsystem for Linux
Alma Linux 8 for WSL in Windows Store Full article: https://www.theregister.com/2022/04/04/almalinux_wsl/
My FREE Git Crash Course
Teachable.com ➡ http://tinyurl.com/s6wtbckx