Fixes #1197 - bad css when missing base

src/webviews/apps/rebase/rebase.ts

@@ -333,6 +333,7 @@ class RebaseEditor extends App {
 				++tabIndex,
 			);
 			$container.appendChild($el);
+			$container.classList.add('entries--base');
 		}
 
 		document

src/webviews/apps/scss/rebase.scss

@@ -204,7 +204,8 @@ $entry-padding: 5px;
 		}
 	}
 
-	&:nth-last-child(2) {
+	.entries--base &:nth-last-of-type(2),
+	:not(.entries--base) &:nth-last-of-type(1) {
 		& select {
 			& > option[value='squash'],
 			& > option[value='fixup'] {