October 26, 2023
0 minute read
Hello readers, Two new podcast episodes recorded and published. 🎙️🎧 Listen and subscribe here: Software Should be Free - Episode 23 - “Git merges, regression testing, hexagonal architecture blog-to-rss-to-email” The Rust Workshop Podcast - Episode 4 - “Consulting, Web projects, Regression tests, TWIR, Rustacean Station, Meetups” Just me on these...
Read More
October 20, 2023
4 minute read
I agree with Dermon: “You should be doing 3-way merges”. I also see most developers I work with (that’s a lot as a contractor over the years) don’t even know what a 3-way merge is, let alone have it correctly configured and are using it. What is a 3-way diff...
Read More
October 20, 2023
1 minute read
The terminology for 3-way git merge, rebase and cherry-pick conflict files is very confusing, particularly because they flip direction between rebase and merge. When you run git mergetool it will spit out 4 files that look like this, and then pass them as arguments to your merge tool of choice:...
Read More