Comments (3)
I don't think this is an issue with the plugin. You just create a merge conflict, which the plugin can't solve more than git. You can set rebase to be used when pulling in the settings.
from obsidian-git.
Thanks for taking the time looking into this!
I'd just like to have configuration in which I can save changes from both machines (as in the above scenario) in one action (per machine) without creating a merge conflict.
I just tried using the "rebase" setting; unfortunately this does not change that I get an error message, however, it seems not to create a merge conflict...
The sequence
- edit file
example.md
on machine A - edit file
example.md
on machine B (different edit) - Git: Create backup on machine A
- git commit on machine B
git pull --rebase
on machine Bgit push
on machine B
works for me without a merge conflict and without an error (given that an automatic merge is possible).
from obsidian-git.
Please share your error messsage. So you are editing the file in two different places, right?
from obsidian-git.
Related Issues (20)
- [Enhancement]: Option to not show/ignore Line Authoring for certain pages/folders
- [Feature Request] Add support for termux git for Android HOT 4
- [Bug]: Https-remotes without the suffix `.git` sync fine, but commands `open file on GH`/`open file history on GH` break. Adding the suffix results in valid URLs.
- [Bug]: Cant make plugin to work [base path does not exist and other errors] HOT 1
- Auto backup doesn't stage files?
- Feature: option to disable on mobile HOT 7
- [Bug]: Updating Github personal access tokens HOT 1
- [Bug]: process.cwd is not a function HOT 4
- [Bug]: ObsidianGit: Base path does not exist HOT 1
- [Feature]: 0-depth history to reduce .git/ size HOT 3
- [Bug]: If the git remote address can't established, the plugins can't use and no tips. HOT 4
- [Bug]: Renaming a file without connections is not picked up by auto backup mechanism
- [Bug]: In the Source Control panel, the right-click menu cannot be opened for formats other than markdown files. HOT 4
- [Bug]: HOT 8
- [Bug]: No information about lack of network connection when trying to pull HOT 2
- [Bug]: iOS Fetching aborted by iOS device auto lock / sleep HOT 1
- [Bug]: Line author information does not work in the canvas environment, please do not let it work under canvas cards.
- NotFoundError: Could not find HEAD on Android
- [Enhancement]: Add support for Multi Repos HOT 1
- [Bug]: Command to easily backup files is gone HOT 3
Recommend Projects
-
React
A declarative, efficient, and flexible JavaScript library for building user interfaces.
-
Vue.js
🖖 Vue.js is a progressive, incrementally-adoptable JavaScript framework for building UI on the web.
-
Typescript
TypeScript is a superset of JavaScript that compiles to clean JavaScript output.
-
TensorFlow
An Open Source Machine Learning Framework for Everyone
-
Django
The Web framework for perfectionists with deadlines.
-
Laravel
A PHP framework for web artisans
-
D3
Bring data to life with SVG, Canvas and HTML. 📊📈🎉
-
Recommend Topics
-
javascript
JavaScript (JS) is a lightweight interpreted programming language with first-class functions.
-
web
Some thing interesting about web. New door for the world.
-
server
A server is a program made to process requests and deliver data to clients.
-
Machine learning
Machine learning is a way of modeling and interpreting data that allows a piece of software to respond intelligently.
-
Visualization
Some thing interesting about visualization, use data art
-
Game
Some thing interesting about game, make everyone happy.
Recommend Org
-
Facebook
We are working to build community through open source technology. NB: members must have two-factor auth.
-
Microsoft
Open source projects and samples from Microsoft.
-
Google
Google ❤️ Open Source for everyone.
-
Alibaba
Alibaba Open Source for everyone
-
D3
Data-Driven Documents codes.
-
Tencent
China tencent open source team.
from obsidian-git.