Comments (2)
You'll need to log into the site that has git sync and play with git.
When you do a git pull origin master,
git pull
performs a merge, which often creates a merge commit. Therefore, by default, pulling from the remote is not a harmless operation: it can create a new commit SHA hash value that didn’t exist before. This behavior can confuse a user, because what feels like it should be a harmless download operation actually changes the commit history in unpredictable ways.
To avoid this, you need
git pull --ff-only
(or not? read on to see which one fits your requirements)
With git pull --ff-only
, Git will update your branch only if it can be “fast-forwarded” without creating new commits. If this can’t be done, git pull --ff-only simply aborts with an error message.
You can configure your Git client to always use --ff-only by default, so you get this behavior even if you forget the command-line flag:
This plugin has worked out of the box, but I also have run into issues before if I have to monkey with git at all (like change branches).
from grav-plugin-git-sync.
I don't have SSH access to the server sadly
from grav-plugin-git-sync.
Related Issues (20)
- Disabling plugin should disable schedule additions HOT 11
- `folders` list in yaml config not respected? HOT 1
- Selective Folder Sync - How To? HOT 4
- Please don't trash repos on first run HOT 7
- GH webhook times out but manual POST request works HOT 1
- Synced folders are supposed to be at root level of the repository HOT 1
- fatal: unable to create thread: Resource temporarily unavailable fatal: the remote end hung up unexpectedly send-pack: unexpected disconnect while reading sideband packet fatal: the remote end hung up unexpectedly error: failed to push some refs to 'https://gitlab.com/repo/projectname.git' HOT 1
- fatal: empty ident name (for ) not allowed HOT 1
- fatal: fetch-pack: invalid index-pack output HOT 1
- I cloned a repo, did some edits, and tried to push to my own repo. This gave me the error
- git push errors HOT 1
- Call to undefined function Grav\Plugin\GitSync\exec() HOT 7
- after all the steps , i still encounter the same issue**Problems:-**
- Committer identity unknown ***
- Help need with "reconcile divergent branches" HOT 3
- Sparse checkout removes local files that are on repo but not in sparse checkout
- GitHub App authentication support
- Unable to connect to gitlab selfhosted with token
- Quick Tray icon doesn't take into account changed admin location
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 grav-plugin-git-sync.