Git rebase -continue vs. new commit

Question

If I encounter merge errors, I usually solve the merge errors, add my files again and use them git rebase --continue
to continue moving and clicking.

Now I had time to study more deeply how git works and it turns out that it is possible to create a new commit instead. I think it might be a good idea to make it clear that there were some merge errors and that they were resolved manually.

So which one is recommended to use and what are their advantages and disadvantages? Thanks in advance!

Answer 1

git rebase --continue. . , , .

Answer 2

, : rebase merge.

Rebase , - , , , .

, , .

(git pull --rebase) , ( ), , git , gitg git log --graph.