Files to be committed:
Local changes conflict with the remote repository. Choose how to resolve this:
Files in contention:
The remote has newer commits and rejected the push. Pull the remote changes first, or overwrite the remote:
Choose one or more .md files, or drop them here. Each note goes under incoming/ and gets a line in the list below. A note never writes over a note that you made.