-
Notifications
You must be signed in to change notification settings - Fork 6
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
Add RACK UI #752
Add RACK UI #752
Conversation
continuous.yml: Build Docker image with tag set to branch's short name (usually dev, but could be dev-test). Push only images built from dev or dev-test branches to Docker Hub.
continuous.yml: Build Docker image with tag set to dev, dev-test, or other depending on branch name. Push only dev and dev-test images to Docker Hub, however.
…nt systemctl enable command
This reverts commit ab4aa2e.
…o/multiple manifest files.
…g schema validation error
…. Prettify the button.
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.
+1 (after you address comments below)
GitHub reports a conflict between this PR and the master branch. When you rebase your dev-test branch on the master branch to resolve that conflict, I think it would be a good idea to squash your commits down to a single commit as well. Otherwise the rebase will report a conflict somewhere in one of the 65 commits, pause, wait for you to fix the conflict before resuming rebasing, probably report another conflict in another commit, pause again, etc.
You have to use git fetch && git rebase -i origin/master
and manually edit the list of 65 commits in a text editor to squash your commits down to 1 commit. The first commit should remain "pick" and the rest of the commits should be changed from "pick" to "squash" or just "s". Git will append all the commits' messages into a single commit message and let you edit that commit message to clean it up before completing the squash.
The difference between the above command and git fetch && git rebase origin/master
(without the "-i") is that the latter command will rebase all 65 commits one after another, and you probably will have to fix conflicts and continue rebasing several times. It's simpler to squash the commits together into a single commit so that you'll have to fix any conflicts in that commit only once.
This is the initial rev of the RACK UI.