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.

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

Finishing feature with --squash not working #18

Open
jluttine opened this issue Aug 25, 2016 · 2 comments
Open

Finishing feature with --squash not working #18

jluttine opened this issue Aug 25, 2016 · 2 comments

Comments

@jluttine
Copy link

Finishing a feature branch with --squash does not work. The end state has develop branch checked out but the feature branch commits have not been merged, they've been only staged or something like that.

I'm using Spacemacs, so the key bindings might be different than in normal Emacs. Anyway, here are the steps to reproduce:

$ mkdir tmp
$ cd tmp
$ git init
$ git flow init
$ emacs
  • Open magit: SPC g s
  • Create feature branch: % f s featurebranch
  • Create a file: SPC f f foobar
  • Save the file: SPC f s
  • Open magit: SPC g s
  • Stage and commit the file.
  • Finish feature branch with squash: % f f -s f

Emacs seems like it hangs, but you can press CTRL g. The feature branch finishing is in some weird non-finished state.

magit-version: Magit 29160815.1946, Git 2.9.3, Emacs 24.5.2, gnu/linux

@tarsius
Copy link

tarsius commented Aug 25, 2016

@jtatarik Maybe you have to do the equivalent of this: magit/magit@75b8e4e

@jluttine
Copy link
Author

I'm using GPG signing if that matters.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

No branches or pull requests

2 participants