The use of -Xtheirs and -Xours appear to be somewhat counterintuitive, so think of it as telling git which branch code to favor when resolving rebase conflicts. For example, when doing:
``` bash
git rebase -Xtheirs branch-b
```
Xtheirs favors your current branch-a code when overwriting merge conflicts, and vice versa -Xours overwrites merge conflicts with the code in branch-b.
Similar options exist in git merge command as well, but the meaning of -Xtheirs and -Xours is reversed due to the differences on how git rebase and git merge operate and what they consider ours vs. theirs:
``` bash
git rebase -Xtheirs branch-b # <-ours:branch-b,theirs:branch-a
Thus, if you are merging changes from origin/master and would like git to favor your current branch code during merge conflicts, you’d need to do this:
-`perf top -t <pid>` shows the performance counters
## rsync
``` bash
rsync -a username@remote_host:/home/username/dir1 place_to_sync_on_local_machine
```
Like ~cp~ and similar tools, the source is always the first argument and the destination is always the second.
## Nginx hosting setup
- [Understanding DNS record types](https://www.name.com/support/articles/205516858-Understanding-DNS-record-types)
- [linuxize: Secure Nginx with letsencrypt on Ubuntu 20.04](https://linuxize.com/post/secure-nginx-with-let-s-encrypt-on-ubuntu-20-04/)
- [DigitalOcean: Secure Nginx with letsencrypt on Ubuntu 20.04](https://www.digitalocean.com/community/tutorials/how-to-secure-nginx-with-let-s-encrypt-on-ubuntu-20-04)
