2013-01-16

Entries

Learned something about GitHub today. Or learned that an assumption of mine was incorrect.

#

I forked the annyong project on GitHub so I could add Twitter Bootstrap to it for fun.

#

Whilst doing so I noticed a stray and broken closing body tag so I fixed it, pushed to my fork on GitHub and submitted a pull request for the fix.

#

I assumed that the Pull Reqeust was locked to the commit I made and continued to add Bootstrap to the project. I pushed those changes to GitHub as well.

#

Today the maintainer of annyong asked me to "rebase my branch" so that it didn't include the Bootstrap changes as well. I had no idea that happend due to my assumption about Pull Requests.

#

I tried to use git revert but it cause a conflict. Due to the smallness of the change I decided to just re-fork and re-apply my fix.

#

So at some point I need to recreate this issue and try to back out of it correctly.

#

An excellent guide for contributing to projects on GitHub: http://thinkupapp.com/docs/contribute/developers/devfromsource.html

#

Comments

comments powered by Disqus