git-smart

git-smart copied to clipboard

Resuming from a failed rebase also needs to re-apply the stash. Should there be a git smart command for resume? Or at least an additional note in the error message.

In the most common instance, it's necessary to do:

git rebase --continue
git stash pop

But maybe there are more cases?

@ghazel: Ran into a possibly similar issue. Would you be able to post your output?

I was running into a failing

Executing: git fetch origin
  From github.com:Invoca/web
   * [new branch]      72.5/H/STORY-1215_Differenciate_processing_signals_for_qa -> origin/72.5/H/STORY-1215_Differenciate_processing_signals_for_qa
   * [new branch]      73/L/STORY-1295-agreement-change -> origin/73/L/STORY-1295-agreement-change
   * [new branch]      73/L/STORY-1295-change-feature-enabled-at -> origin/73/L/STORY-1295-change-feature-enabled-at
   * [new branch]      73/L/STORY-1295-record-calls-agreements -> origin/73/L/STORY-1295-record-calls-agreements
   * [new branch]      73/L/STORY-1295-rename-record_calls_prompt -> origin/73/L/STORY-1295-rename-record_calls_prompt
* You have 153 new commits on 'master'.
* There are 59 new commits on 'origin/master'.
* Both local and remote branches have moved on. Branch 'master' needs to be rebased onto 'origin/master'
Executing: git rebase -p origin/master

and then it would fail the rebase and leave me hanging (git rebase --abort to get back to my broken state)

The only way that I am actually able to fix the issue is to do git pull --rebase

EDIT If this is a different issue than yours I can go ahead and open a separate issue

Same issue. You have to manually call git pull --rebase (or abort) and then remember to git stash pop after that.

This ticket is a feature request to make this whole process easier.