Mar 20, 2018
Post comments count0
Post likes count1
Stop cherry-picking, start merging, Part 7: Preventing a change from leaving a branch
More advanced merge base tricks.
Showing archive results for 2018
Mar 19, 2018
Post comments count0
Post likes count1
Stop cherry-picking, start merging, Part 6: Replacing the temporary fix with the permanent fix
Advanced merge base tricks.
Mar 16, 2018
Post comments count0
Post likes count1
Stop cherry-picking, start merging, Part 5: Exploiting the three-way merge
Making sure you have the correct merge base.
Mar 15, 2018
Post comments count0
Post likes count2
Stop cherry-picking, start merging, Part 4: Exploiting the recursive merge algorithm
Recursive merging for fun and profit.
Mar 14, 2018
Post comments count0
Post likes count6
Stop cherry-picking, start merging, Part 3: Avoiding problems by creating a new merge base
Move the cherry-pick into the merge base so that git knows it exists in both sides.
Mar 13, 2018
Post comments count0
Post likes count2
Stop cherry-picking, start merging, Part 2: The merge conflict that never happened (but should have)
You wish you got a merge conflict, but you didn't.
Mar 12, 2018
Post comments count0
Post likes count9
Stop cherry-picking, start merging, Part 1: The merge conflict
Setting the pieces into motion.
Mar 9, 2018
Post comments count0
Post likes count0
Torsken har ankommet
Cod you believe it?
Mar 9, 2018
Post comments count0
Post likes count1
Why is the daylight saving time cutover time 1 millisecond too soon in some time zones?
Another other time zone anomalies.
Mar 8, 2018
Post comments count0
Post likes count1
What’s the difference between CreateTimerQueueTimer and SetThreadpoolTimer?
They are both the same thing under the covers.