Journal 2022-06-02
<!-- Morning --> <!-- What do I want to do today? --> <!-- Evening --> <!-- What did I learn today? --> <!-- Things I learned --> <!-- Useful tools and libraries -->Git
Merge and Rebase conflicts
- You can use the command
git checkout --ours/--theirsto get our or the remote/target version of a file