-
Notifications
You must be signed in to change notification settings - Fork 24
Updating Dashboard
This page assumes that you already have an instance of Dashboard running locally (or deployed) and that you would like to bring this local version up to date with the latest version of this Github repo.
Most updates to Dashboard do not require any changes to your custom submodule. Therefore, if you're unsure of which process to follow, you should start by assuming that the submodule has not been changed. If an update requires the submodule to be changed, it will be explicitly noted.
You can grab the changes from the Dashboard github repository by running the terminal commands from within your local dashboard folder:
git stash && git pull origin master && git stash pop
This method will never have any conflicts because you shouldn't be committing anything to the dashboard repo directly. Enjoy seamless updates that you can integrate as soon as we release them :)
In the case of updates to dashboard that also require updates to the configuration submodule, you should take these actions. However, we'll try to avoid this type of update as much as possible. We will also communicate this change in the release notes and you will have to deal with a merge conflict. Simply keep as much of your copy as you can while also integrating the changes we've made.
In this situation you'll have to do the following from within your hackathon-config folder.
git add remote upstream https://github.com/hackumass/redpandahacks-config.gitgit pull upstream master- Deal with the merge conflicts! Keep your content and our formatting and you should be good to go :)