On 02/05/2011 14:03, Pavel Sanda wrote:
Abdelrazak Younes wrote:
For the casual patch contributor who wants to work as if it was svn, it is
very simple:
Formerly it was:
initially: svn checkout
periodically: svn up
to view diff: svn diff
to revert local changes: svn revert
Now it will be:
initially: git clone
periodically: git pull
to view diff: git diff
to revert local changes: git checkout
Not really more complicated isn't it?
depends how crazy business with the branches do you intend to have.
if want to copy svn workflow then its no difference of course ;)
That's the key point: casual contributor won't see the branches at all
if they don't want too. They just need to checkout the experimental
branch to see the close-to-real time development, that's all.
The maintainer will take care of the branch merging into "master" upon
request of the developers. But their branch may be periodically merged
to "experimental" if the developer is OK with that.
The workflow would be then pretty simple for me:
1) I have a great idea and I want to start from "master"
git branch abdel-great-idea master
git checkoutabdel-great-idea
2) I develop:
git commit -a
git add xxx
etc.
3) I ask the maintainer: my new great idea is mostly functional now, would you please
merge it periodically to "experimental"?
4) I develop some more, some other devs might join...
5) My feature is ready: I ask the maintainer if he is OK to merge it into
"master"
if yes -> kool, my new great idea will be in next release
if no -> too bad, let's work on it some more...
Isn't that simple and useful?
Abdel
