Android Studio (resp. IntelliJ IDEA) provides a very good diff and merge tool. Android Studio can also be integrated into the terminal.
Sooner or later you will get to the point where you need to use Android tools via the terminal.
When editing a Markdown file, Android Studio suggests installing the Markdown Plugin. The IntelliJ IDEA 2020.3 Doku (Android Studio Arctic Fox 2020.3.1 is b...
So you already managed to enable the developer options on your Android device and also enabled USB-Debugging.
Ever wondered why most diff tools and git clients complain a missing newline at the end of the file?