Rebase suggestions and questions for post release

Had some questions / suggestions for rebasing. Nothing here is urgent and can be address post 1.7.0 release.

• The resolve carrot is warped. Shouldn’t it look like the Open in Editor one?

• When using git rebase --skip in the cmd line, I noticed there was nothing in the Desktop UI that popped up. Does anything from this need to be surfaced in the Desktop UI?

• Should we use an alternate word instead of “Continue rebase” as I noticed that when the button is active, it does not entirely mean the same thing as git rebase --continue cmd. This may be confusing to newer users, but I have no strong feelings on this one.

[shiftkey]

Coming back to the last outstanding questions:

Does anything from this need to be surfaced in the Desktop UI?

I’m not sure what we can do here if the rebase was completed outside the app aside from closing out the dialog because we no longer detect .git/REBASE_HEAD - we could poke at the reflog to see some recent activity, but I think if you’re finishing the rebase outside the app you don’t need our help.

If you rebase --skip ahead and encounter conflicts Desktop should update itself when you switch back, to help you resolve these conflicts and continue.

Should we use an alternate word instead of “Continue rebase” as I noticed that when the button is active, it does not entirely mean the same thing as git rebase --continue cmd.

You’re right in that we might --skip underneath if there’s no changes to apply as part of the commit, but I’m fine with this button representing “proceed with the rebase” without being a literal representation of the plumbing.

I’ve got some other feedback about the information we show when setting up the rebase that I’d like to tackle before this goes out to everyone. I’ll keep these things in mind, but for the moment I’m going to close this out to focus on the current iteration of the rebase flow.

[shiftkey]

@tierninho thanks for this input!

The resolve carrot is warped. Shouldn’t it look like the Open in Editor one?

Probably - these styles were borrowed from Merge Conflicts so I’ll see what’s available there.

• When using git rebase --skip in the cmd line, I noticed there was nothing in the Desktop UI that popped up. Does anything from this need to be surfaced in the Desktop UI?

I’m not sure I understand this bit - what git rebase --skip does is ignore the current commit in the rebase (because it doesn’t contain any tracked changes to use) and continues rebasing commits until it either completes successfully or encounters conflicts.

For the example screenshot above, it looks like you’ve got conflicts again to resolve, and switching back to Desktop should show those. Do you recall what Desktop did at the time? There might be some context in the log about whether it was able to detect the conflicted state again…

• Should we use an alternate word instead of “Continue rebase” as I noticed that when the button is active, it does not entirely mean the same thing as git rebase --continue cmd.

I’ve got mixed feelings on this - --skip is mostly just like --continue but it drops the current path:

--skip Restart the rebasing process by skipping the current patch.

I feel like changing the UI to sometimes say “we’re gonna skip this commit because there’s nothing to do” feels confusing in a different way, especially to users who aren’t familiar with what git rebase is doing underneath. I’d hold off on exposing more context until we’ve gotten feedback from users about what makes sense and what might be a source of confusion.