News for hackers. Stuff that matters.
Re:Confessions of a Git Skeptic by hobbyist on Wednesday February 20, 2013 @01:32PM (#5252262)
Once speaking to a freebsd developer, he explained the problems with git in freebsd workflow.

His explanation was on the lines that if there are 100 developers working on different trees of freebsd and they want to commit their work, it causes a race, as if some one commits before you, you need to do a git pull, incorporate changes and then push, even when they are working on unrelated components.

My response to this was yes, and that is why git allows you to create branches so cheaply, but he still was not convinced.

Re:Confessions of a Git Skeptic by pseut on Wednesday February 20, 2013 @02:23PM (#5252614)
I like rebase for this rather than merging the changes. But it's kind of strange to think of it as a problem that you'd need to acknowledge the other developers' work before committing...
Re:Confessions of a Git Skeptic by hobbyist on Wednesday February 20, 2013 @05:39PM (#5253884)
Well, if 2 people are working on different files, they can commit their changes to svn without updating their local copy first. But in git you have to bring your copy to the same revision as the remote one, in order to push your changes, irrespective whether the changes you made our conflicting