[0:35:00] Merge conflicts
Status: Abandoned
Brought to you by:
mdbesten
Menu
▾
▴
#23 [0:35:00] Merge conflicts
Am I the only one who thinks that the person who asks the question about branch merging has a point? In deed a centralized distribution system allows the initial developer to follow closely the developpement and the obligation to resolve the conflicts is the guaranty for the project to follow the unique objective of one man even if he was helped (a lot) by many along the way. Then I wonder, Is GIT fitted for small or very specific projects when resolving merge conflicts seems to be less painful ?
1)the philosophy of open source is that your project doesn't belong only to you but to the community and that anyone can do anything with your poject so it is exactly the opposite of "follow the unique objective of one man even if he was helped (a lot) by many along the way"
2)even if it's less painful it's still painfull so it is better to use git even for small projects, it will branch but it might still go where you want to, while if you do not allow people to do what they want, they might just not contribute to your project...
I know the philosophy but If someone has a specific idea of what he wants to develop but he needs help? Ideas have to come from someone even in Open Source community right?
Yes, you do what you want and if someone is interested he will join you, however if you start something that doesn't interest him, he can leave and you will be on your own (but you're free to developp your ideas of course)
so everyone wille have an opportunity ... even if he wasn't in the circle of trust!!!
and it's up to you to decide what to merge and from whom !
If we think that when you choose what to merge and you choose from whom you are merging it means you are working on a small part of the project.. but in fact Git is more fitted for large projects (Git is also very fast for fetching revision histories due to the information being held locally. It performs especially well for large projects as Git does not get much slower as the project history grows )
check this link : http://www.hector.ac.uk/cse/documentation/SoftwareManagement/