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)
- [Bug]: Git pull for Git submodules fail when no upstream remote repo defined HOT 2
- [Feature]: Force pull / reset --hard HEAD HOT 9
- [Feature]: Multiple Repository
- [Bug]: plugin is not installing HOT 1
- [Bug]: Android: "%%%%%" on left of each line in source mode HOT 2
- using another git lib on android HOT 3
- [Enhancement] Multiple remotes support HOT 2
- [Bug]: Obsidian freezing from having any setting enabled HOT 2
- Feature request: Support Git move HOT 1
- [Bug]: GPG doesn`t work when program is .sh file or with ~/
- [Feature]: Make Auto Backup commits amendable HOT 1
- [Bug]: Git init doesn't work properly when a custom git-dir value is set through the 'Custom Git directory path' setting HOT 1
- [Bug]: git obsidian error: TypeError [ERR_INVALID_ARG_VALUE]: The argument 'args[6]' must be a string without null bytes HOT 1
- [Proposal]: Rename the plugin to "Git Backup" HOT 4
- [Feature Request]: Push on Close HOT 1
- [Bug]: Freshly installed plugin renders Obsidian unusable! HOT 4
- [Bug]: Persistent Authentication Requests HOT 2
- [Enhancement Suggestion]: Make .git folder outside of value folder by default HOT 8
- [Bug]: Plugin causes Micro lags
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.