search

tryexceptpass / sofi

an OS agnostic UI module for Python
MIT License
387 stars 49 forks source link

Added Bootstrap Jumbotron, Well #71

Closed jigarmistry closed 8 years ago

tryexceptpass commented 8 years ago

Could you squash your commits please with a rebase -i and don't forget to mention the issue numbers on the final summary commit.

jigarmistry commented 8 years ago

Still need to add some logic ... Initial draft.. for icons

jigarmistry commented 8 years ago

Could you squash your commits please with a rebase -i and don't forget to mention the issue numbers on the final summary commit.

How?

tryexceptpass commented 8 years ago

You should be able to git rebase -i master which will bring up an editor where you can chose how to include your commits. The idea is to pick one of your new commits and squash the others into it. This cleans up the history into one commit that includes all your changes. Normally GitHub allows me to do this automatically before merging your pull request, but it's not giving me the option this time around (I think because you committed to the same pull request we had closed already)

Here's a reference: https://git-scm.com/book/en/v2/Git-Tools-Rewriting-History

jigarmistry commented 8 years ago

Sorry for my mistake... If anything serious please close this PR. I will create new PR with all changes. Will keep in mind for future. I think, I forgot to take upstream update.

jigarmistry commented 8 years ago

Closing this PR. I will create New PR with all latest changes. If you have any workaround please suggest.