I’m always interested when someone has a strong opinion on how to merge code. I like this article because the author acknowledges that it’s just a matter of tradeoffs and then makes a case for a merge commit.
👉 The case for creating a merge commit
His basic argument is that a merge commit is the best of both worlds since it “maintains the small changes while allowing for 30,000 feet view of the history” with the
--first-parent git log option.
At the end of the day, what matters is to find a workflow that suits your team well and lets you deliver.
He also links to a couple of great articles on using small iterations (Kent Beck’s SB chages and GeePaw Hill’s MMMSS) that I need to blog later!
Xcode project files are complex and not meant to be human-readable, so they can be scary to merge. When there’s a conflict, it’s never fun.
The tool Kintsugi intends to automatically solve these conflicts for you “99.9% of the time.”
👉Automatically merging conflicts in Xcode project files | github
The name Kintsugi (金継ぎ) is well-chosen, meaning “the art of repairing broken pottery by mending it with gold.” 🤯
Another interesting note: this project relies on a framework called Xcodeproj that lets you create and modify Xcode project files automatically. That sounds likes a better alternative than a homespun shell script. 👍
via iOS Dev Weekly
Generate some HTML changelogs with the built-in
👉 Generating a project changelog using Git log
This works if each commit is a useful change and has a useful commit message. 🤷🏻♂️
Sometimes there are those bugs that are easiest nailed by by simply figuring out where they started. Which commit started this problem?
I’ve done this many times by going through the commit history, but a recent post reminded me about git bisect, which makes the process easier.
👉 A beginner’s guide to GIT BISECT – The process of elimination
Thank you, git.
Finally, a very concise and straightforward explanation of git merge vs. rebase. This is clearest, simplest explanation I have seen on this confusing topic. It’s also very practical with simple how-to’s, pros and cons.
👉 An Introduction to Git Merge and Git Rebase: What They Do and When to Use Them