Git workflow

[Cheba]

I'm not a git ninja. And I have some troubles with proposed rebasing.
Can anybody help me with git? I have a few questions.

While I can push to mattetti repo I'm not sure if I have to. Do I push
directly to mattetti or to mine repo and then request a pull?

Also if I do work with my own repo on github how do I merge changes
from matteti repository?

How do I use rebase? I've seen git rebasing screencast and have red
man on git rebase but I never used it before and not sure how to use
it in this case.

Maybe a page with short howto on preferred git workflow for
translators would be useful for everybody.

[Dale Campbell]

I agree that a workflow page would be helpful. If I get some time,
I'll write one up. As for your questions, you should fork mattetti's
repo then clone and push to your forked repo. Once you have something
you'd like to add to mattetti, fetch and rebase from his repository,
fix any conflicts, then push to your repo and send mattetti a pull
request. These commands should get you started:

# Inside of your forked repository:
$ git remote add mattetti git://github.com/mattetti/merb-book.git
$ git fetch mattetti # This will fetch the updated changes, but not
merge them.
$ git rebase mattetti/master # Merge mattetti's stuff into your
current branch.
# If there were any conflicts, fix them, then do this:
$ git rebase --continue
$ git push origin master # Push the changes to your forked repo.

If you need any other help, let me know here or jump in the IRC
channel.

[Damir Zekić]

On 7 Dec 2008, at 21:00, Dale Campbell wrote:
> Once you have something you'd like to add to mattetti, fetch and
> rebase from his repository, fix any conflicts, then push to your
> repo and send mattetti a pull request.

Doesn't that beat the purpose of giving translation leaders the push
privilege?

I totally agree that we should request pulls when we want to change
original (English) content, but it seems to me more practical to push
the translated content directly to mattetti/master.Î

--
Damir Zekić
http://twitter.com/sidonath

[Dale Campbell]

Ahh, yes, you're right. If you're doing translation stuff, you can
push directly to mattetti's repository. Thanks for clearing this up,
Damir.

[Matt Aimonetti]

My only concern with pushing directly to my repo is that you my generate conflicts with people working on the English version.

I'm wonder if we shouldn't have language specific branches and rebase them against master once a week and merge them in.

What do you guys think?

- Matt

2008/12/7 Dale Campbell <osh...@gmail.com>

[Dale Campbell]

I think language specific branches would be a pretty good idea.

[zhonghai zuo]

I agree, that can keep the job easier and less extraction when working on the English version...

--Z

[Damir Zekić]

I agree as well

[Arthur Zapparoli]

Totally agree with that.

Translations should be easy too. We can do a diff between branches to
compare changes in the English version. It'll help woking on the
English book instead of "freezing" chapters for translation.

[]'s
Arthur Zapparoli
http://merb-br.org
http://arthurgeek.net