diff options
| author | Joey Hess <joeyh@joeyh.name> | 2015-07-30 12:08:57 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2015-07-30 12:08:57 -0400 |
| commit | f17020cb7fa2b2967b96afc10a2cd82de8a977cc (patch) | |
| tree | b5b13dfd9178fdfb1ee44fa7687b916850e4f4af /doc/forum/gitpush_problem/comment_4_3843d9b82431f175f9194159a73a1fc9._comment | |
| parent | b09a97c8747bbdfa81ffc9ca94935e7254bbfd4a (diff) | |
fixed
Diffstat (limited to 'doc/forum/gitpush_problem/comment_4_3843d9b82431f175f9194159a73a1fc9._comment')
| -rw-r--r-- | doc/forum/gitpush_problem/comment_4_3843d9b82431f175f9194159a73a1fc9._comment | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/doc/forum/gitpush_problem/comment_4_3843d9b82431f175f9194159a73a1fc9._comment b/doc/forum/gitpush_problem/comment_4_3843d9b82431f175f9194159a73a1fc9._comment new file mode 100644 index 00000000..7e8bcdb2 --- /dev/null +++ b/doc/forum/gitpush_problem/comment_4_3843d9b82431f175f9194159a73a1fc9._comment @@ -0,0 +1,13 @@ +[[!comment format=mdwn + username="joey" + subject="""comment 4""" + date="2015-07-30T16:07:14Z" + content=""" +I have found a workaround -- Since git pull is broken, it can instead do a +git fetch followed by a git merge. I've put that fix in place. + +Unfortunately, --spin can't be used to deploy a fix that breaks the --spin +transport! So, hosts that are suffering from this problem will need to have +their propellor git repos updated in some other way, like pulling from a +central git repo. +"""]] |