Learn Git by Building an SQL Reference Object

Backend Development
1

You can see that the latest commit is at the bottom here. Be careful not to change the wrong commits. One of the options is r, reword = use commit, but edit the commit message . Replace pick with an r next to the commit with the message feat: add column reference to reword the message, it’s the very first commit you added to this branch. When you are done, save the file and exit Nano. Git will put you in another Nano instance to reword the commit message. Don’t change anything in it yet.

image
image2548×1213 251 KB

Problem:
-nano does not open +
-camper: /sql_reference$ git rebase --interactive --root
fatal: apply options and merge options cannot be used together
camper: /sql_reference$

1 Like
2

Did you ever figure this out? I have the same error

3

https://stackoverflow.com/questions/75234755/git-rebase-failed-with-fatal-cannot-combine-apply-options-with-merge-options/75294595#75294595

This helped me move past this error, but now it’s stuck again.

rm -r ".git/rebase-apply"

Maybe you will have better luck

4

This topic was automatically closed 182 days after the last reply. New replies are no longer allowed.