Re: [git-users] git merge multiple commits as single commit?

Hi Tony, On 01/17/14 12:19, Tony M wrote: Hi All, I have a personal branch of the master branch and work in my personal branch. Once I have a feature ready in my branch, I pull the latest from the master branch(which is updated by other users as well), and then merge the latest to my bra

Re: [git-users] git merge multiple commits as single commit?

Hello, at step 4 I would do a rebase instead of a merge. This way when you merge your local changes to master in step 6, you can do an interactive rebase, and squash all your local commits into one general commit. I don’t see your problem though, why is it a problem that your changes appear as mul

[git-users] git merge multiple commits as single commit?

Hi All, I have a personal branch of the master branch and work in my personal branch. Once I have a feature ready in my branch, I pull the latest from the master branch(which is updated by other users as well), and then merge the latest to my branch then push my branch to master (I know i