Practical fixes for tool errors, setup blocks, and workflow issues.

Fix Git Merge Conflicts When Stash Changes Are Involved

You're mid-merge, and Git tells you there's a conflict. But you also have stashed changes...