Skip to content

Instantly share code, notes, and snippets.

@nguyenit67
Created July 21, 2021 09:30
Show Gist options
  • Save nguyenit67/a61dec2e217df9779a909030c1fead37 to your computer and use it in GitHub Desktop.
Save nguyenit67/a61dec2e217df9779a909030c1fead37 to your computer and use it in GitHub Desktop.
git: apply stash when conflict
$ git reset --merge
https://stackoverflow.com/a/60444590
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment