Advertisement
Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- Microsoft Windows [Version 10.0.19042.1110]
- (c) Microsoft Corporation. All rights reserved.
- C:\Users\karen\Udacity And SUSE Cloud Native\Lesson 5 - CICD\python-helloworld\argocd>git pull
- remote: Enumerating objects: 6, done.
- remote: Counting objects: 100% (6/6), done.
- remote: Compressing objects: 100% (4/4), done.
- remote: Total 4 (delta 1), reused 0 (delta 0), pack-reused 0
- Unpacking objects: 100% (4/4), 1.00 KiB | 16.00 KiB/s, done.
- From https://github.com/karenworld/python-helloworld
- 9023471..fc74d68 master -> origin/master
- Updating 9023471..fc74d68
- Fast-forward
- argocd/argocd-nginx.yaml | 17 +++++++++++++++++
- 1 file changed, 17 insertions(+)
- create mode 100644 argocd/argocd-nginx.yaml
- C:\Users\karen\Udacity And SUSE Cloud Native\Lesson 5 - CICD\python-helloworld\argocd>git pull
- remote: Enumerating objects: 11, done.
- remote: Counting objects: 100% (11/11), done.
- remote: Compressing objects: 100% (8/8), done.
- remote: Total 8 (delta 6), reused 0 (delta 0), pack-reused 0
- Unpacking objects: 100% (8/8), 1.43 KiB | 15.00 KiB/s, done.
- From https://github.com/karenworld/python-helloworld
- fc74d68..02210c2 master -> origin/master
- Updating fc74d68..02210c2
- Fast-forward
- argocd/argocd-nginx.yaml | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
- C:\Users\karen\Udacity And SUSE Cloud Native\Lesson 5 - CICD\python-helloworld\argocd>git add .
- C:\Users\karen\Udacity And SUSE Cloud Native\Lesson 5 - CICD\python-helloworld\argocd>git commit -m "add helm"
- On branch master
- Your branch is up to date with 'origin/master'.
- Changes not staged for commit:
- (use "git add <file>..." to update what will be committed)
- (use "git restore <file>..." to discard changes in working directory)
- modified: ../.vagrant/machines/default/virtualbox/action_provision
- modified: ../.vagrant/machines/default/virtualbox/action_set_name
- modified: ../.vagrant/machines/default/virtualbox/id
- modified: ../.vagrant/machines/default/virtualbox/index_uuid
- modified: ../.vagrant/machines/default/virtualbox/private_key
- modified: ../Vagrantfile
- Untracked files:
- (use "git add <file>..." to include in what will be committed)
- ../helm/
- ../templates/
- no changes added to commit (use "git add" and/or "git commit -a")
- C:\Users\karen\Udacity And SUSE Cloud Native\Lesson 5 - CICD\python-helloworld\argocd>git push -u origin master
- To https://github.com/karenworld/python-helloworld.git
- ! [rejected] master -> master (fetch first)
- error: failed to push some refs to 'https://github.com/karenworld/python-helloworld.git'
- hint: Updates were rejected because the remote contains work that you do
- hint: not have locally. This is usually caused by another repository pushing
- hint: to the same ref. You may want to first integrate the remote changes
- hint: (e.g., 'git pull ...') before pushing again.
- hint: See the 'Note about fast-forwards' in 'git push --help' for details.
- C:\Users\karen\Udacity And SUSE Cloud Native\Lesson 5 - CICD\python-helloworld\argocd>git pull
- remote: Enumerating objects: 6, done.
- remote: Counting objects: 100% (6/6), done.
- remote: Compressing objects: 100% (4/4), done.
- remote: Total 4 (delta 2), reused 0 (delta 0), pack-reused 0
- Unpacking objects: 100% (4/4), 964 bytes | 29.00 KiB/s, done.
- From https://github.com/karenworld/python-helloworld
- 02210c2..825dd8c master -> origin/master
- Updating 02210c2..825dd8c
- Fast-forward
- argocd/argocd-helm-python-prod.yaml | 17 +++++++++++++++++
- 1 file changed, 17 insertions(+)
- create mode 100644 argocd/argocd-helm-python-prod.yaml
- C:\Users\karen\Udacity And SUSE Cloud Native\Lesson 5 - CICD\python-helloworld\argocd>git push -u origin master
- Everything up-to-date
- Branch 'master' set up to track remote branch 'master' from 'origin'.
- C:\Users\karen\Udacity And SUSE Cloud Native\Lesson 5 - CICD\python-helloworld\argocd>git add .
- C:\Users\karen\Udacity And SUSE Cloud Native\Lesson 5 - CICD\python-helloworld\argocd>git commit -m "add helm"
- On branch master
- Your branch is up to date with 'origin/master'.
- Changes not staged for commit:
- (use "git add <file>..." to update what will be committed)
- (use "git restore <file>..." to discard changes in working directory)
- modified: ../.vagrant/machines/default/virtualbox/action_provision
- modified: ../.vagrant/machines/default/virtualbox/action_set_name
- modified: ../.vagrant/machines/default/virtualbox/id
- modified: ../.vagrant/machines/default/virtualbox/index_uuid
- modified: ../.vagrant/machines/default/virtualbox/private_key
- modified: ../Vagrantfile
- Untracked files:
- (use "git add <file>..." to include in what will be committed)
- ../helm/
- ../templates/
- no changes added to commit (use "git add" and/or "git commit -a")
- C:\Users\karen\Udacity And SUSE Cloud Native\Lesson 5 - CICD\python-helloworld\argocd>git push -u origin master
- Everything up-to-date
- Branch 'master' set up to track remote branch 'master' from 'origin'.
- C:\Users\karen\Udacity And SUSE Cloud Native\Lesson 5 - CICD\python-helloworld\argocd>
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement