Closed Sean-Nishi closed 10 months ago
When you get the chance can you put the merge commits into your original 2 commits? In an interactive rebase fixup or squash the two commits. Next rebase again to the first commit and add the changes that should be in there but were placed in the second commit
24