Git 2.41.0

This release makes merge conflicts easier to resolve inside Obsidian.

When a merge has conflicts, Source Control now lists the affected files and shows how many conflict blocks remain in each one. Open a file to review highlighted blocks and choose Keep ours, Keep theirs, or Keep both. You can also resolve all blocks in a file at once or edit them manually. When a file’s count reaches zero, select the plus icon to mark it resolved. Once every conflict is resolved, commit the merge and push as usual. A merge status button provides these steps in the app.

Other additions

• Open a file’s content at a specific commit from the History view.
• Initialize or clone a repository directly from Source Control when no repository is found.
• Optionally limit file operations to the vault when it sits inside a larger Git repository. Repository-wide operations such as pull and checkout still affect the whole repository.
• Configure automatic stashing when pulling with rebase on desktop.
• Migrated to the new declarative settings definition so settings can be searched for

This release also improves mobile amend support, fixes several diff and Source Control issues, and handles merge commits with no staged file changes.

Requires Obsidian 1.13.0 or later. Full changelog

See the changelog for details.