The Lounge is rated Safe For Work. If you're about to post something inappropriate for a shared office environment, then don't post it. No ads, no abuse, and no programming questions. Trolling, (political, climate, religious or whatever) will result in your account being removed.
Ya know, when I saw that article a week or two ago, I wondered how long it would take someone here to bring it up.
".45 ACP - because shooting twice is just silly" - JSOP, 2010 ----- You can never have too much ammo - unless you're swimming, or on fire. - JSOP, 2010 ----- When you pry the gun from my cold dead hands, be careful - the barrel will be very hot. - JSOP, 2013
Where I am working now we are using GIT, like many company before.
But, and this is a first for me, everyone is working on their own branch and, every now and then people make a pull request to develop to be approved by the lead developer.
Of course one should make sure the pull request has no conflict. But since 2 weeks of work from an other developer can drop anytime... despite me merging my branch from develop every morning I am having lots of painful merge conflicts... every few days....
What I wonder:
is it common practice to have every developer working on its own branch instead of the whole team working on a common branch?
Sure, but "private ownership" of the branch doesn't exist -- if the dev moves on to a different feature/product, he'll work on the branch for that, and someone else will take over the branch he'd been working on.
I wanna be a eunuchs developer! Pass me a bread knife!
Rule 1: you never really know what you are doing, so we will come to your office and kill you if you edit directly on the production branch
Rule 2: if you think you know what you are doing, please refer to Rule 1.
I use Git at home but at work we use SVN and for a lot of the work we cut ourselves a new branch for each new 'user story'(an abuse of the English language).
Once we have finished our work and it has been code reviewed and passed code review we then merge the changes into trunk.
At that point we sometimes hit merge conflicts and on rare occasions it does become a bit of a merge hell.
If you are merging your branch every morning and you are getting lots of merge conflicts that would suggest that something is not quite right and I can think of a few reasons for this occurring:
(1) You are not cutting a new branch each time you are staring new work.
(2) The code base is poorly written with methods that are hundreds of lines long and are shared by many parts of the system leading to developers working on the same section of code at the same time.
(3) Someone else is not cutting a new branch and is introducing a whole load of old code which you are then having to correct with your commits.
“That which can be asserted without evidence, can be dismissed without evidence.”