Trying to figure out how to do a rebase… I initiated a rebase of one branch to another in Sublime Merge, used SM to resolve the conflict, saved the changes and staged them. At that point I didn’t know how to continue the rebase, i.e. git rebase --continue from within SM. I had to do via the command line. Any ideas?
Rebase --continue after resolving conflicts?
msun
#1
0 Likes
wbond
#2
The commit button should convert to a “Continue rebase” button in that situation. If you experience the problem again, could you open an issue at https://github.com/sublimehq/sublime_merge/issues.
0 Likes