“• You share your knowledge…”
Well true, but do we need one more blog on the web? Why don’t you simply share it on sites like http://stackoverflow.com

“• You might even make some money with blogging…”
The money you make with Adsense on a blog are small bucks, and I think on a programming blog are even smaller bucks, and I suspect this for two good reasons:
1) I hardly see ADs on programmers blogs
2) I have never clicked on an AD on a programmer’s blog, I hardly click ADs in general, but I do sometimes clicked ADs on Google SERPs and on some blogs that was not related to programming.

Last but not least, I do subscribed via RSS feeds to many blogs (currently 7), but no one of them are about programming. The reasons? I think reading must be also a way to relax, when I read about marketing, cooking, how to build company, etc I do relax, when I read how to code this and that, it’s not relaxing, I would need to try it on my PC etc. In some way it’s like math, it’s not something you can read on your way to work while sitting on the bus.

What do you think?

-vm
c:\program files\java\jre6-32\bin

Voila, problem solved!

The better and simpler way is to pull from green repository to your local repository before you push to your remote. It is better, because you can solve merge conflicts first and loose no time. It is simpler, because you can script it on your machine. This is what we usually do.

While that would work my concern would be time to produce the feedback. With the above the compilation and test phases would execute followed by the push to the golden repository. The downside to this is that if your repository is not up to date, you compile, test and then push but the push fails, you will have just lost the time it took to compile,test. I was thinking possibly doing a pull before the compilation process so the CI’s clone of the developers remote repository can at least try and be up to date before undergoing build and test.

No, because you can’t handle merge conflicts at this point at all. If it is not a fast forward git will refuse to push from developer remote to green. In that situation you have to pull from green to your local again, handle merge conflicts there, and then push again to your developer remote.

Last but not least there is a simple rule for preventing merge conflicts. Commit often, pull often and push often. On average I do a commit, pull, push cycle every hour during development. If your teammates do the same there will be no problem.

Great article. Im just wondering do you find it a pain handling any merge conflicts when pushing from a developers remote repository to the green repository?