cadey
/
propellor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Added a comment: try to use the fix

This commit is contained in:
picca 2015-07-30 17:52:53 +00:00 committed by admin
parent 1c1865da6d
commit b39f552381
1 changed files with 33 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
doc/forum/gitpush_problem/comment_5_4075a141f6345267ade09f6c793dc2c8._comment Normal file
View File

@ -0,0 +1,33 @@
[[!comment format=mdwn
username="picca"
subject="try to use the fix"
date="2015-07-30T17:52:53Z"
content="""
Hello I built the debian package of your git repository with debuild and installed it.
then I run propellor in order to upgrade my local repo
:~/.propellor$ propellor
** warning: ** Your /home/picca/.propellor is out of date..
A newer upstream version is available in /usr/src/propellor/propellor.git
To merge it, find the most recent commit in your repository's history that corresponds to an upstream release of propellor, and set refs/remotes/upstream/master to it. Then run propellor again.
So I followed the advices, found the most recent commit which was the one created when I run for the first time propellor cb7f1acc108609b345dbec26d8113513bf7b4ece
But now when I run propellor,I get thir message
:~/.propellor$ propellor
** warning: ** Your /home/picca/.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 the merge,
~/.propellor$ git merge upstream/master
Already up-to-date.
so nothing happend
"""]]