I have successfully resolved the conflict, using
git pull --rebase origin main
git add <files>
git rebase --continue
After some days, I realised, I might have made mistake while resolving conflict. Picked the wrong code maybe.
Q: How to check the diff after the commit is resolved by rebase?
Note:
- For conflict resolved by merge is simple because it would have a merge commit. I can directly check that by
git show <merge-commit>, but for rebase, I don't have a clue.
