Fix Git Merge Conflicts When Stash Changes Are Involved - How to Use --allow-unrelated-histories in Git-Docker Build Context Canceled: How to Fix It

Best fit
Decision rule
Switching note
Decision checklist
- Match the tool to the workflow that fails most often, not only the feature list.
- Keep export format, permissions, and automation limits in the final decision.