Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Ours/Theirs for popping stash conflicts? #10

Open
Kolobamanacas opened this issue Feb 10, 2023 · 2 comments · May be fixed by #12
Open

Ours/Theirs for popping stash conflicts? #10

Kolobamanacas opened this issue Feb 10, 2023 · 2 comments · May be fixed by #12

Comments

@Kolobamanacas
Copy link

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. :)
@Nitaym Nitaym linked a pull request Feb 14, 2023 that will close this issue
Added stash pop. Resolves issue #10 #12
Open
@Nitaym
Copy link
Owner

Nitaym commented Feb 14, 2023

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

@Kolobamanacas
Copy link
Author

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging a pull request may close this issue.

Added stash pop. Resolves issue #10 Nitaym/ourstheirs
2 participants
@Nitaym @Kolobamanacas