if I am in a branch local_branch
when I type git rebase remote_branch
who is us and who is them
- is local_branch us making remote_branch them
or - is local_branch them and remote_branch us
Simple answer please 1 or 2?
I typed git rebase and it says some file is deleted by us and modified by them
1