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

Already on GitHub? Sign in to your account

Snapshot destroys merge state #249

Closed
dabrahams opened this Issue Aug 2, 2011 · 4 comments

Comments

Projects
None yet
2 participants
Contributor

dabrahams commented Aug 2, 2011

I just did a snapshot while resolving a merge and my merge commit (in progress) became a non-merge commit. I think this is a bug.

Owner

tarsius commented May 13, 2013

Does this also happen if you create the snapshot on the command line?

Owner

tarsius commented Jun 23, 2013

Please reopen if this is still an issue.

@tarsius tarsius closed this Jun 23, 2013

Owner

tarsius commented Jan 24, 2014

It is possible to do this using git stashs --keep-index and --index arguments. I will do that once I have merged some changes to the popup code, which will, among other things allow setting such defaults (and will also allow users to change the defaults). I don't want to make these options the default until it is possible for users to change that, because it can cause failure in cases where not using these options would have worked just fine.

Ps: It would help if you did follow up on your own feature requests and bug reports. There were several instances where I got no reply to "is this still an issue".

@tarsius tarsius reopened this Jan 24, 2014

Owner

tarsius commented Feb 22, 2014

Implemented on the next branch. See #1220.

@tarsius tarsius closed this Feb 22, 2014

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment