Keeping daux update without overwriting personal changes

[nathan-isaac]

What is the best way to keep my version of daux.io updated with the latest version from GitHub without git overwriting the changes I have make in the "docs" directory. When I do a git pull, git complains about wanting to overwrite my changes to the config.json file. Thanks.

[dkisselev]

You could try adding the docs folder to .gitignore. I'm not sure if that
will stop pulls though.

Personally, I just download the zip and re-extract. (Leaving the docs
folder as-is)
On 2013-07-23 8:45 AM, "Nathan" notifications@github.com wrote:

What is the best way to keep my version of daux.io updated with the
latest version from GitHub without git overwriting the changes I have make
in the "docs" directory. When I do a git pull, git complains about wanting
to overwrite my changes to the config.json file. Thanks.

—
Reply to this email directly or view it on GitHubhttps://github.com//issues/40
.

[nathan-isaac]

Would it be possible to create an update task for grunt, or is that out of the scope of what grunt can do?

Thanks @Kisselev for your advice. I will try the "downloading zip" idea for now.

[dkisselev]

Try adding docs/ to the .gitignore file (on a new line) in your daux folder, then do a git pull.

I think that should stop git from overwriting the config.

I'm hesitant to add this to the repository though because I'm currently changing a lot of the backend around so config.json will be quite different for 1.0

[onigoetz]

The way daux is packaged changed to be a composer dependency, you don't need to download daux and all its files separately anymore.

You can run composer global require justinwalsh/daux.io and it will install daux globally, you can then use the daux command to generate your documentation

(Your $PATH must contain ~/.composer/vendor/bin for it to work)