Re: [Semanticscuttle-devel] Added branch for configurable privacy ....

[Brett D. <bs...@fr...>]

Hello, Christian.

My apologies for the mix-up. I think I've corrected this by pushing to
the master at origin. However, now the configurable-privacy branch shows
two parents.

Rgrds,
Brett

On Mon, 7 Mar 2011 14:00:02 +0100, Christian Weiske
<cw...@cw...> wrote:
> Hi Brett,
> 
> 
>> I've made changes for this feature and have added a test to
>> BookmarkTest.php.
>>
>> This is the first time I've pushed a new branch using git, so I'm not
>> sure if I've done it right. Please have a look at the
>> configurable-privacy branch and let me know if this looks okay.
> 
> No, it's not ok. You created a completely fresh branch starting from
> nothing, but normally you start from an existing branch - i.e. master.
> 
> $ git clone ...
> $ git checkout master
>  -> branch you want to base from
> $ git checkout -b my-new-branch
>  -> create new branch
> $ git checkout my-new-branch
>  -> switch to new branch
> 
> Now you do your changes and commit.
> Currently, I cannot just "diff" the changes to see what you changed.