On 18 Nov 2010, at 17:04, Emmanuel Bernard wrote:
I think it was Trustin not rebasing before pushing.
You work on your features in isolation as you've described.
And the person that will integrate your pull request need to rebase your branch before
merging to master. Let's say it's Trustin.
git checkout master
git pull infinispan master
git fetch galder
git checkout -b ISPN-774 galder/ISPN-774
git rebase master
//if fails, ask Galder to fix
//review, run tests
git checkout master
git pull infinispan master
//be sure to be up to date with the latest latest
//if it is not, you need to rebase ISPN-774 again
git merge ISPN-774
git push infinispan master
Yes, you are correct, this is the right approach. I was under the impression this would
cause issues with the original contributor, if you rebase on upstream, but this is fine
since the topic branch is nuked anyway.
I'll look at updating the pull script.
--
Manik Surtani
manik(a)jboss.org
Lead, Infinispan
Lead, JBoss Cache
http://www.infinispan.org
http://www.jbosscache.org