8000 New Installation Docs by rjmoggach · Pull Request #374 · freqtrade/freqtrade · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

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

Merged
merged 6 commits into from
Jan 15, 2018
Merged

New Installation Docs #374

merged 6 commits into from
Jan 15, 2018

Conversation

rjmoggach
Copy link
Contributor

Updated, cleaned up installation docs...

```bash
cp config.json.example config.json
cat config.json.example >> config.json
Copy link
Member

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

Copy link
Contributor Author

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...

Copy link
Member

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?

Copy link
Member
@glonlas glonlas Jan 13, 2018

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

@rjmoggach
Copy link
Contributor Autho 8000 r

changed cat to cp -n

@glonlas
Copy link
Member
glonlas commented Jan 15, 2018

Hi @robmoggach, could you please rebase from develop and solve the conflict, then we are good to go.

@rjmoggach
Copy link
Contributor Author
rjmoggach commented Jan 15, 2018 via email

@glonlas
Copy link
Member
glonlas commented Jan 15, 2018

Because you did your update directly on your develop branch, I do not know what will be the result.
For next updates, I suggest to always use a branch.

  1. git checkout develop (switch back to develop branch)
  2. git pull (get the last update from the official develop branch)
  3. git checkout -b my_branch_name (create a new branch from the content of develop)
  4. do your updates
  5. git push origin my_branch_name (push your branch to your repo)

then when develop got updated, you just have to git pull develop to get the latest updates, then rebase from develop.

  1. git checkout develop (switch back to develop branch)
  2. git pull (get the last update from the official develop branch)
  3. git checkout my_branch_name (go back to your branch)
  4. git rebase develop (integrate the last updates from develop into your branch)
  5. git push origin my_branch_name
8000

@glonlas
Copy link
Member
glonlas commented Jan 15, 2018

I will check how to remove your conflicts

@glonlas glonlas merged commit 5a50b88 into freqtrade:develop Jan 15, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants
0