Git Workflow

[Brandon]

Hi Hirosi,

I'm new to development with Git. I'd like to know what kind of
workflow works. My current understanding is for me to do work on a
task, I fork your Master, then make my changes, commit, then push to
my master and then send you a pull notification. I think this is
incomplete.

Do i need to create my own Fork or should I create a branch of your
master for each task I work on?

Any suggestions will be helpful or even links to read about Git
workflow. I don't want to interfere with other development so I'd like
to get good with Git soon.

Thanks,

Brandon

[hiroshi saito]

Hi Brandon,

See your commit logs from:
http://github.com/btennant/Unofficial-Google-Wave-Notifier/commits/

This is your first commit:
http://github.com/btennant/Unofficial-Google-Wave-Notifier/commit/6f76f40097cc9487f6115fcd72a0a2c1d936e554

Form differences of this commit, I cannot know which lines are changed
for new function.

See another commit by Mike (msroest):
http://github.com/hiroshi/Unofficial-Google-Wave-Notifier/commit/f7b6cf1f9e8bfd3952c7a2eed82751420744b303#diff-52

From this commit I can understand which lines are changed. I agreed
with those changes then I pull the changes into my repos.
(This contains very tiny unintentional white space changes, but ignorable.)

I hope you understand what I'd like to say, in spite of my terrible English ;)

Also I mentioned about indentations, but I found It's my fault. Sorry.
I replaces all tabs into 4 spaces at master branch.

I think current my master branch is a good starting point for you to
add new function.
If you are not reluctant to do so, I suggest that you abandon a
current "master" branch and renew from mine by following steps:

1. rename local "master" to another name

git branch -m master old_master

2. remove remote "master"

git push origin :master

3. re-fetch my master branch

git fetch git://github.com/hiroshi/Unofficial-Google-Wave-Notifier.git
master:master

4. push new master

git push origin master

5. I recommend that create new topic branch for new function

git checkout -b new-branch-name

I'm not a git ninja, every time I consult with "git help" command or
google when I want to do irregular operations (e.g. It is first time I
used `git branch -m`).

Cheer
--
Hiroshi Saito

[Brandon]

Thanks for the instructions. I found that pretty helpful.

Take a look in my fork, i created a topic branch called "alternative-
browser-select". This contains all the functionality for that feature
and hopefully makes it easier to see only the changes needed for you
to do a pull.

Brandon

On Jan 1, 11:36 pm, hiroshi saito <hiroshi3...@gmail.com> wrote:
> Hi Brandon,
>
> See your commit logs from:http://github.com/btennant/Unofficial-Google-Wave-Notifier/commits/
>

> This is your first commit:http://github.com/btennant/Unofficial-Google-Wave-Notifier/commit/6f7...

>
> Form differences of this commit, I cannot know which lines are changed
> for new function.
>

> See another commit by Mike (msroest):http://github.com/hiroshi/Unofficial-Google-Wave-Notifier/commit/f7b6...

[hiroshi saito]

Occasionally, I found a guideline document of another project.
http://github.com/thoughtbot/factory_girl/blob/master/CONTRIBUTION_GUIDELINES.rdoc

It has same concept of what I mean I suppose.