-
-
Notifications
You must be signed in to change notification settings - Fork 7.9k
New Installation Docs #374
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Conversation
docs/installation.md
Outdated
```bash | ||
cp config.json.example config.json | ||
cat config.json.example >> config.json |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We are copying a file, so I'd rather stick to cp
rather than cat
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
cp
will clobber any existing file... cat >>
will append and not overwrite... but I see both points...
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
will append yes, but then what are the likelyhoods that the appended config file is valid json anymore?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
in this case, I suggest adding the param -n:
cp -n config.json.example config.json
Man: http://manpages.ubuntu.com/manpages/precise/en/man1/cp.1.html
changed |
Hi @robmoggach, could you please rebase from develop and solve the conflict, then we are good to go. |
haven't done that before - explain and i'll do it... thanks
…--
Robert Moggach
http://moggach.com
Mobile (647) 544-1793
On Sun, Jan 14, 2018 at 5:43 PM, Gérald LONLAS ***@***.***> wrote:
Hi @robmoggach <https://github.com/robmoggach>, could you please rebase
from develop and solve the conflict, then we are good to go.
—
You are receiving this because you were mentioned.
Reply to this email directly, view it on GitHub
<#374 (comment)>, or mute
the thread
<https://github.com/notifications/unsubscribe-auth/AALRt7cJM9YSHb1f1w8g_X-UWS8RLVpjks5tKq1cgaJpZM4RdHMD>
.
|
Because you did your update directly on your develop branch, I do not know what will be the result.
then when develop got updated, you just have to git pull develop to get the latest updates, then rebase from develop.
|
I will check how to remove your conflicts |
Updated, cleaned up installation docs...