Annotate Protips with structured data

Work on https://assembly.com/coderwall/bounties/384.

Link to the image with Google Webmaster Tools results.
Need help one more time. How do I do rebase and squash correctly in this case?

What I tried: 
I create locally new branch with my 13 commits. I reseted master to have no commits. I rebased new branch on the oldest commit before my changes and squashed 13 commits into the one.

Than I merged that into master locally and everything looked fine (only one commit with all my changes).

But I couldn't push that code to github because my local master was different from github version.

Do you have any tips? I didn't have chance to use rebase before.