This text has been commited and pushed via the Obsidian git plugin. Keep in mind that on windows, this can only be done if the repository is cloned via HTTPS, not SSH cert.
This text has been commited and pushed via the Obsidian git plugin. Keep in mind that on windows, this can only be done if the repository is cloned via HTTPS, not SSH cert.
##### Staying in sync
There are three actions to keep your local Obsidian folder in sync with the online Git repository: *Pull*, *Commit* and *Push*.
-**Pull**: ask the online Git repo if there are any new changes that you don't have yet
-**Push:** upload your local changes (which the online Git repository does not have yet)
- a *Push* only works when you have at least one new, unpublished commit
-**Commit**: Gather all changes that you made since the last commit. Then, they can be pushed.
If you are unfamiliar with source control systems such as Git, it may seem strange to execute *two* actions (Commit, then Push) when you want to sync your work. However, there may be situations where you want to bundle some changes (maybe work on Topic A) into one commit and some other changes (work on Topic B) into another commit. These could later be reviewed independently.
For a convenient workflow, it is recommended to assign a keyboard shortcut to the `Obsidian Git` actions `Commit all changes`, `Push` and `Pull`. If you cannot memorize your shortcuts, press `Ctrl+P` and type `commit`, `push` or `pull` in the quick action bar, which will also show you the shortcuts if you had any assigned.
##### Merge conflicts
If there are changes to the same line of a file by two different users at the same time, there will be a merge conflict. That means, two versions exist and somebody must decide how to resolve the text back into one version with all the information in it.
