When rebasing a topic branch with 2 commits on master and each commits has conflicts, the conflict resolution UI appears for the first commit, I resolve the conflicts, then commit, but instead of showing the UI for the 2nd commit and its conflicts (which is the case with 1.3.2), with 1.3.3, there's just this error:

% git status
On branch master
Your branch is up to date with 'origin/master'.

Untracked files:
  (use "git add <file>..." to include in what will be committed)
	guides/getting_started/apps_directory.md
	guides/getting_started/okta_groups.md