The client was stuck in a stash and merge loop in GitHub Desktop — every time they restored their stashed changes, it created the same file conflicts repeatedly, causing frustration and blocking their workflow.
I analyzed the issue through screenshots and identified it as a stash re-application loop rather than a standard merge conflict. I explained the root cause clearly, guided the client through resolving the conflicts, committing the changes, and safely discarding the stash entry to break the loop. I also hosted a quick Google Meet call to walk them through the steps live in GitHub Desktop.
The issue was fully resolved in the same session. The client confirmed the problem was fixed and left a positive review.
