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

Merge commit message stays when resolved via git CLI #61

Closed
clounie opened this issue Jul 7, 2017 · 5 comments

Comments

Projects
None yet
3 participants
@clounie
Copy link

commented Jul 7, 2017

Steps to reproduce:

  1. Pull in a branch to cause a merge conflict
  2. View it in Fork's Changes view so that Fork adds the "Merge branch 'XXX' of repo-link into YYY" message (with conflict list in the description)
  3. Resolve conflicts and commit them via the vanilla git CLI
  4. The message/description do not go away in Fork, even though the conflict was resolved + committed.

@clounie clounie changed the title [Minor bug] Merge commit message stays when resolved in CLI [Minor bug] Merge commit message stays when resolved via git CLI Jul 7, 2017

@clounie clounie changed the title [Minor bug] Merge commit message stays when resolved via git CLI Merge commit message stays when resolved via git CLI Jul 7, 2017

@olets

This comment has been minimized.

Copy link

commented Apr 30, 2019

I'm seeing the same thing. Here's how to reproduce it by hitting an empty cherry-pick during a rebase:

  1. Make a commit
  2. git revert @
  3. git rebase -i @~2. In the interactive editor delete the first commit, save, and close
  4. Switch to Fork and back to the terminal
  5. git rebase --continue

@DanPristupov DanPristupov added this to the 1.0.78 milestone May 2, 2019

@DanPristupov

This comment has been minimized.

Copy link
Contributor

commented May 13, 2019

I forgot to mention that this must be fixed in 1.0.78

@olets

This comment has been minimized.

Copy link

commented May 30, 2019

@DanPristupov I'm still seeing a flavor of this in 1.0.78.2. Overlaps a lot with this ticket, but lmk if I should open a new one:

  1. In Fork, check "amend"
  2. Make a commit with CLI Git
  3. In Fork, see that "amend" is still checked (a bug? I'm not sure. if so, it's different from this ticket)
  4. Uncheck "amend", see that the message persists
@DanPristupov

This comment has been minimized.

Copy link
Contributor

commented May 31, 2019

@olets

In Fork, see that "amend" is still checked (a bug? I'm not sure. if so, it's different from this ticket)

That's correct, the checkbox should stay checked.

Uncheck "amend", see that the message persists

It should not, until you edited the message. In my case, the message haven't persisted.

@olets

This comment has been minimized.

Copy link

commented May 31, 2019

It should not

I agree, that's what I expect

In my case, the message haven't persisted.

Interesting, it persists for me. I'll experiment more later.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.