James Tan ([email protected]) wrote:
> Hi Ward,
> 
> (CC-ing the list, as it might be useful to others too. Hope you don't mind!)

This is great James, thanks a lot for writing it up.  Glad to see that
your workflow is nearly identical to mine :-)

[snipped]

> 6) Done with the rebase, I now force push the changes back to my fork:
> 
>     > git push -f personal
> 
>     WARNING: Be very careful when doing a forced push, and NEVER force push
>     to main branches in the Crowbar repos (eg. master branch in all
>     github.com/crowbar/xxx repos).

I'd say never force push to *any* branches in the github.com/crowbar
repos, let alone the main branches.

> 7) I double check my changes on the Github web UI, and then submit a pull
>     request from there. Make changes and rebase again if necessary.

8) If necessary, update your existing pull request(s) via

    $ git push -f personal

As previously mentioned on this list, github handles this nicely, and
it keeps the audit trail for any given issue in a single place.

> Hope this helps! I'll move this to the devguide after collecting comments
> and feedback here.

That would be great, thanks!  I submitted a Trello card for this:

    https://trello.com/c/3MPzzpgr

_______________________________________________
Crowbar mailing list
[email protected]
https://lists.us.dell.com/mailman/listinfo/crowbar
For more information: http://crowbar.github.com/

Reply via email to