cloudstack-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rhtyd <...@git.apache.org>
Subject [GitHub] cloudstack issue #1660: CLOUDSTACK-9470: [BLOCKER] Bug in SshHelper affectin...
Date Fri, 26 Aug 2016 18:09:44 GMT
Github user rhtyd commented on the issue:

    https://github.com/apache/cloudstack/pull/1660
  
    @nvazquez okay, there are many ways to do this. Here's how you can do it fairly easily
without merge conflicts:
    
        git checkout <your PR branch>
        git format-patch -1 # this will create a .patch file of your commit
        git fetch origin # note origin points to asf or apache/cloudstack github remote
        git reset --hard origin/4.9 # this will move your branch's HEAD to origin/4.9 i.e.
your branch is now exactly origin/4.9
        git am <patch file you created above>
        git push <your own remote you used to send this PR> sshhelperissue -fv # this
will force push and update your remote branch and the commit on this PR
    
    Hope this helps :)


---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---

Mime
View raw message