Hi, On Saturday 20 April 2013 12:08 AM, sathish manohar wrote: > Hi Guys/Gals, > > I'm working on a Ruby on Rails project which is hosted as a Git > project under Bitbucket. The other developer who is working on the > project has forked the repository and sends pull requests from his > master branch to my master branch, when I comment on necessary > corrections, he creates new commits. Now when I go ahead and merge the > pull-request, the history has bugfix commits which are not necessary. >
You can do either do a "git merge --squash" or a "git rebase -i" and set one specific commit as the 'main' commit to 'pick' and set all the rest to 'squash'. These commands squash multiple commits into one. > Please suggest a workflow that suits 2 to 3 people group, who are in > close communication, keep a clean topic branch and still get the work > done. > Hmm, I would recommend reading through the different approaches mentioned here: http://git-scm.com/book/ch5-3.html#Integrating-Contributed-Work and choose one that fits your needs (or try out each of them for a short period and see which works best). IMHO, I suggest using the 'git-flow' workflow: http://nvie.com/posts/a-successful-git-branching-model/ In fact, there is a tool named git-flow, that lets you do this without having to think about it: https://github.com/nvie/gitflow cheers, - steve > Thanks, > Sathish > http://youtube.com/sathishmanohar > http://twitter.com/sathishmanohar > _______________________________________________ > ILUGC Mailing List: > http://www.ae.iitm.ac.in/mailman/listinfo/ilugc > _______________________________________________ ILUGC Mailing List: http://www.ae.iitm.ac.in/mailman/listinfo/ilugc
