Re: [w3c/webpayments-payment-apps-api] Diagrams (#132)

@ianbjacobs, so, what's happening is that you need to push with force - also try avoid "merge" entirely. 

Your workflow should be:

```Bash
git checkout gh-pages
git pull gh-pages
git checkout -b "feature_or_bug_to_fix"
git commit -m "action(optional context): thing I did (closes #bug_number)" index.html 
``` 

If you see other PRs coming in after you sent your pull request:

```Bash 
git checkout gh-pages
git pull gh-pages 
git checkout "feature_or_bug_to_fix"
git rebase gh-pages
git push -f 
```

Last push there will prevent your history from growing. Then we should always squash merge here on Github - making sure the history massage makes sense.

Again, happy to help with this stuff (git can be annoying and confusing) - but please let's make a real effort to always check things are in a good state in the repo before merging.  


-- 
You are receiving this because you are subscribed to this thread.
Reply to this email directly or view it on GitHub:
https://github.com/w3c/webpayments-payment-apps-api/pull/132#issuecomment-294273531