summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorpicca2018-03-04 10:41:01 +0000
committeradmin2018-03-04 10:41:01 +0000
commitaa8817047a6b0f66df3b6c873b0d4102f379992b (patch)
treeece989573c5445e9856b35e005395f8b300ba90f /doc
parent1d39a530e386b2dc692d35120397ef95eaa8c1f7 (diff)
Added a comment
Diffstat (limited to 'doc')
-rw-r--r--doc/forum/__42____42___warning:___42____42___Your___126____47__.propellor__47___is_out_of_date../comment_14_a65bf71d16401e2621f1dff93701247d._comment35
1 files changed, 35 insertions, 0 deletions
diff --git a/doc/forum/__42____42___warning:___42____42___Your___126____47__.propellor__47___is_out_of_date../comment_14_a65bf71d16401e2621f1dff93701247d._comment b/doc/forum/__42____42___warning:___42____42___Your___126____47__.propellor__47___is_out_of_date../comment_14_a65bf71d16401e2621f1dff93701247d._comment
new file mode 100644
index 00000000..c5427cd7
--- /dev/null
+++ b/doc/forum/__42____42___warning:___42____42___Your___126____47__.propellor__47___is_out_of_date../comment_14_a65bf71d16401e2621f1dff93701247d._comment
@@ -0,0 +1,35 @@
+[[!comment format=mdwn
+ username="picca"
+ avatar="http://cdn.libravatar.org/avatar/7e61c80d28018b10d31f6db7dddb864c"
+ subject="comment 14"
+ date="2018-03-04T10:41:01Z"
+ content="""
+Hello, sorry to bother you with this BUT :))
+
+Now I have the right message which explain how to upgrade my .propellor
+(sorry for the french)
+
+ picca@mordor:~$ propellor
+ Fusion automatique de src/Propellor/Property/Systemd.hs
+ Fusion automatique de src/Propellor/Property/SiteSpecific/JoeySites.hs
+ Fusion automatique de src/Propellor/Property/Git.hs
+ Fusion automatique de src/Propellor/Git/VerifiedBranch.hs
+ Fusion automatique de src/Propellor/Git.hs
+ Fusion automatique de src/Propellor/EnsureProperty.hs
+ Fusion automatique de src/Propellor/DotDir.hs
+ Fusion automatique de propellor.cabal
+ Fusion automatique de joeyconfig.hs
+ Fusion automatique de doc/README.mdwn
+ Fusion automatique de debian/changelog
+ ** warning: ** Your ~/.propellor/ is out of date..
+ A newer upstream version is available in /usr/src/propellor/propellor.git
+ To merge it, run: git merge upstream/master
+
+but when I try to do the merge, I get this error message
+
+ picca@mordor:~/.propellor$ LANG=C git merge upstream/master
+ fatal: refusing to merge unrelated histories
+
+How can I help to solve this issue ?
+
+"""]]