I did that merge-as-cherry-pick thing, but my change still didn't merge correctly
September 29, 2022
Sep 29, 2022
09/29/22
A case study of what goes wrong.
Showing 21 - 30 of 35 results for “git”
Why is every other line of my file mysteriously changed to nonsense Chinese characters?
March 28, 2022
Mar 28, 2022
03/28/22
Decoding another type of mojibake.
How can I bulk-revert a subdirectory of a repo to an earlier commit?
October 5, 2020
Oct 5, 2020
10/5/20
Read it into the index.
The C++/WinRT "capture" function helps you interoperate with the COM ABI world
September 17, 2020
Sep 17, 2020
09/17/20
Simplifying a common COM pattern.
Le Chatelier's principle in action: Notifications
September 11, 2018
Sep 11, 2018
09/11/18
Let me notify you about things you don't care about.
Stop cherry-picking, start merging, Part 3: Avoiding problems by creating a new merge base
March 14, 2018
Mar 14, 2018
03/14/18
Move the cherry-pick into the merge base so that git knows it exists in both sides.
What are the odds that two pull requests get completed at the exact same time?
March 26, 2018
Mar 26, 2018
03/26/18
Merges do not occur instantaneously, so there is a window of opportunity for overlap.
Stop cherry-picking, start merging, Part 10: Web-based workflow for Azure DevOps (formerly VSTS)
March 23, 2018
Mar 23, 2018
03/23/18
Clicking your way to a merged cherry-pick.
Stop cherry-picking, start merging, Part 7: Preventing a change from leaving a branch
March 20, 2018
Mar 20, 2018
03/20/18
More advanced merge base tricks.
Stop merging if you need to cherry-pick
July 9, 2018
Jul 9, 2018
07/9/18
An opposing view from the VSTS team.
Light
Dark