Stuck on an issue?

Lightrun Answers was designed to reduce the constant googling that comes with debugging 3rd party libraries. It collects links to all the places you might be looking at while hunting down a tough bug.

And, if you’re still stuck at the end, we’re happy to hop on a call to see how we can help out.

Invalid state encountered when rebase during merge conflict

See original GitHub issue

The rebase option is present during a manual merge conflict resolution. The Rebase Current Branch menu option should be disabled. Generally it is, but follow these steps and there is a case where it isn’t.

Repro Steps:

Branch > Merge into current branch (make sure there are conflicted files)
click Merge... button
x the modal, subsequently banner pops up
Branch > Rebase Current Branch

[App] invalid state encountered - rebase flow should not be used when merge conflicts found

sometimes this would show in the console as well as part of testing above:

install.ts:23 `git -c credential.helper= fetch --progress --prune --recurse-submodules=on-demand origin` exited with an unexpected code: 128.
remote: Anonymous access denied
fatal: Authentication failed for 'https://ghe.io/tierninho/Blah.git/'

(The error was parsed as 3: Authentication failed. You may not have permission to access the repository or the repository may have been archived. Open preferences and verify that you're signed in with an account that has permission to access this repository.)

v ee09fac078, mac

Issue Analytics

State:
Created 4 years ago
Comments:6 (6 by maintainers)

Top GitHub Comments

1reaction

shiftkeycommented, Mar 27, 2019

We’re already tracking #7017 which is a more holistic view of these menu items, so I’m fine to cross-reference this example and close this out.

1reaction

tierninhocommented, Mar 27, 2019

Yes, that is correct. Feel free to close if needed.

Top Results From Across the Web

Git rebase merge conflict cannot continue - Stack Overflow

There are a couple situations where I've seen rebase get stuck. One is if the changes become null (a commit has changes that...

Resolving conflicts during a Git rebase - David Winterbottom

A conflict happens. On your working branch, you run: git rebase origin/master. and are faced with a wall-of-text:.

Cannot continue git rebase after conflict resolution: file needs ...

Sometimes when rebasing with conflicts, rebase cannot be continued after conflicts are resolved (probably when same change was made in both branches).

How to Resolve Merge Conflicts in DVC | Data Version Control

Git merge conflicts can happen in DVC files when combining changes from multiple team members.

How do I deal with conflicts in my Git repo? - Beanstalk Help

This often happens when you are trying to merge one branch into another (including git pulls). If you change code on the same...