Ravi Sir's Cards › Chapter 3: Branch, Merge, Rebase, Stash and Pull Requests
Have you resolved a conflict and used stash yourself?
Have you resolved a conflict and used stash yourself? Yes: I made two branches edit the same line, merged, fixed the conflict, and practised stash and pop.

Lesson: 3.15 Lab — colour, one conflict, one stash · मराठी card