Closed bengland2 closed 5 years ago
ben, looks like you left the old file behind. Can you squash the commits?
I think I've fixed the problem, can you squash the commits together? I was told there is a checkbox for this in github when merging. If not, how do I do it, other than submitting a brand new PR?
Here's what I usually do:
# have a clean working copy of your branch:
$ git status # no modified files
$ git reset HEAD^ # do this until `git log` no longer shows your commiits
$ git add -u # add all your changes
$ git status # make sure you didn't miss anything (like new files)
$ git commit # make one commit
$ git push origin <yourbranch> --force # force push it to your github branch, PR will be updated
Done
On Wed, Aug 29, 2018 at 1:40 PM, Patrick Donnelly notifications@github.com wrote:
Here's what I usually do:
have a clean working copy of your branch:
$ git status # no modified files $ git reset HEAD^ # do this until
git log
no longer shows your commiits $ git add -u # add all your changes $ git status # make sure you didn't miss anything (like new files) $ git commit # make one commit $ git push origin--force # force push it to your github branch, PR will be updated — You are receiving this because you authored the thread. Reply to this email directly, view it on GitHub https://github.com/batrick/ceph-linode/pull/35#issuecomment-417041195, or mute the thread https://github.com/notifications/unsubscribe-auth/ABozcz7l0S0JS6B-GN0OTIreh-7EDnJLks5uVtIRgaJpZM4WQCf5 .
Since all nodes in ceph-linode clusters have different hostnames each time the cluster is provisioned, this makes it more difficult to write scripting (except for ansible playbooks/commands) or login to hosts. This script converts an ansible inventory file (generated by ceph-linode linode-launch.py) to a /etc/hosts file so that you can then do commands like: ssh mon-000 ceph -s.