ourstheirs icon indicating copy to clipboard operation
ourstheirs copied to clipboard

Published 20 hours ago • verified publisher icon Nitaym

Ours/Theirs for popping stash conflicts?

Open Kolobamanacas opened this issue 2 years ago • 2 comments

This confusing git naming is so well explained at website, I really appreciate it. But, could you please also add another paragraph about same meanings in case of stash's pop conflicts? I guess, it would save millions nerve cells of future generations. :)

Kolobamanacas avatar Feb 10 '23 14:02 Kolobamanacas

Hey @Kolobamanacas! I've added stash pop under the linked PR. Mind reviewing?

Nitaym avatar Feb 14 '23 12:02 Nitaym

@Nitaym, I took a look at the PR. Looks good to me! Thanks a lot! :)

Kolobamanacas avatar Feb 15 '23 07:02 Kolobamanacas