From damien.cassou at gmail.com  Thu Sep  1 13:57:16 2011
From: damien.cassou at gmail.com (Damien Cassou)
Date: Thu, 1 Sep 2011 04:57:16 -0700
Subject: [sbe-discussion] [SquareBracketAssociates/PharoByExample-english]
	212fd9: Small fix from Jannik
Message-ID: <20110901115716.6C15742594@smtp1.rs.github.com>

  Branch: refs/heads/master
  Home:   https://github.com/SquareBracketAssociates/PharoByExample-english

  Commit: 212fd970020cab17a68f932c4071c86d1a9d4c74
      https://github.com/SquareBracketAssociates/PharoByExample-english/commit/212fd970020cab17a68f932c4071c86d1a9d4c74
  Author: Damien Cassou <damien.cassou at gmail.com>
  Date:   2011-09-01 (Thu, 01 Sep 2011)

  Changed paths:
    M PetitParser/PetitParser.tex

  Log Message:
  -----------
  Small fix from Jannik



From bouraqadi at gmail.com  Mon Sep  5 16:23:32 2011
From: bouraqadi at gmail.com (NouryBouraqadi)
Date: Mon, 5 Sep 2011 07:23:32 -0700
Subject: [sbe-discussion] [SquareBracketAssociates/PharoByExample-english]
	3a2395: Merge branch 'master' of https://github.com/Square...
Message-ID: <20110905142332.8E18742611@smtp1.rs.github.com>

  Branch: refs/heads/master
  Home:   https://github.com/SquareBracketAssociates/PharoByExample-english

  Commit: 3a239578e0e2249cdb0466cb638d82c6d3544406
      https://github.com/SquareBracketAssociates/PharoByExample-english/commit/3a239578e0e2249cdb0466cb638d82c6d3544406
  Author: NouryBouraqadi <bouraqadi at gmail.com>
  Date:   2011-09-05 (Mon, 05 Sep 2011)

  Changed paths:
    M Block/Block.tex
  M PBE2.tex
  M Profiling/Profiling.tex
  M Sockets/Sockets.tex

  Log Message:
  -----------
  Merge branch 'master' of https://github.com/SquareBracketAssociates/PharoByExample-english


  Commit: b575d92fba6afb0f754fcfe92cb0a436a2288b5c
      https://github.com/SquareBracketAssociates/PharoByExample-english/commit/b575d92fba6afb0f754fcfe92cb0a436a2288b5c
  Author: NouryBouraqadi <bouraqadi at gmail.com>
  Date:   2011-09-05 (Mon, 05 Sep 2011)

  Changed paths:
    M Sockets/Sockets.tex

  Log Message:
  -----------
  Pass on the conclusion of the Sockets chapter


Compare: https://github.com/SquareBracketAssociates/PharoByExample-english/compare/6ea0563...b575d92

From bouraqadi at gmail.com  Tue Sep  6 14:29:15 2011
From: bouraqadi at gmail.com (NouryBouraqadi)
Date: Tue, 6 Sep 2011 05:29:15 -0700
Subject: [sbe-discussion] [SquareBracketAssociates/PharoByExample-english]
	cf8674: addition of a sections with experient tips to the ...
Message-ID: <20110906122915.0851C4219B@smtp1.rs.github.com>

  Branch: refs/heads/master
  Home:   https://github.com/SquareBracketAssociates/PharoByExample-english

  Commit: cf8674f7dee5b3694a48761bbbbb06d61c824608
      https://github.com/SquareBracketAssociates/PharoByExample-english/commit/cf8674f7dee5b3694a48761bbbbb06d61c824608
  Author: NouryBouraqadi <bouraqadi at gmail.com>
  Date:   2011-09-06 (Tue, 06 Sep 2011)

  Changed paths:
    M Sockets/Sockets.tex

  Log Message:
  -----------
  addition of a sections with experient tips to the Sockets chapter



From bouraqadi at gmail.com  Tue Sep  6 14:39:05 2011
From: bouraqadi at gmail.com (NouryBouraqadi)
Date: Tue, 6 Sep 2011 05:39:05 -0700
Subject: [sbe-discussion] [SquareBracketAssociates/PharoByExample-english]
	1bfc20: Fix typos of the Sockets chapter
Message-ID: <20110906123905.683664234B@smtp1.rs.github.com>

  Branch: refs/heads/master
  Home:   https://github.com/SquareBracketAssociates/PharoByExample-english

  Commit: 1bfc20b9f801b5343448ceebb7468beeaf44dcfa
      https://github.com/SquareBracketAssociates/PharoByExample-english/commit/1bfc20b9f801b5343448ceebb7468beeaf44dcfa
  Author: NouryBouraqadi <bouraqadi at gmail.com>
  Date:   2011-09-06 (Tue, 06 Sep 2011)

  Changed paths:
    M Sockets/Sockets.tex

  Log Message:
  -----------
  Fix typos of the Sockets chapter



From black at cs.pdx.edu  Thu Sep  8 16:38:10 2011
From: black at cs.pdx.edu (Andrew P Black)
Date: Thu, 8 Sep 2011 07:38:10 -0700
Subject: [sbe-discussion] [SquareBracketAssociates/PharoByExample-english]
	3e4843: Edits and comments from Andrew while on holiday
Message-ID: <20110908143810.B45AA425E0@smtp1.rs.github.com>

  Branch: refs/heads/master
  Home:   https://github.com/SquareBracketAssociates/PharoByExample-english

  Commit: 3e484369b92428bfeab9d11606a71bb2b60a40f2
      https://github.com/SquareBracketAssociates/PharoByExample-english/commit/3e484369b92428bfeab9d11606a71bb2b60a40f2
  Author: Andrew P Black <black at cs.pdx.edu>
  Date:   2011-09-08 (Thu, 08 Sep 2011)

  Changed paths:
    M Metacello/Metacello.tex

  Log Message:
  -----------
  Edits and comments from Andrew while on holiday



From marianopeck at gmail.com  Thu Sep  8 18:01:39 2011
From: marianopeck at gmail.com (Mariano Martinez Peck)
Date: Thu, 8 Sep 2011 18:01:39 +0200
Subject: [sbe-discussion] Cannot push to github
Message-ID: <CAA+-=mU_8K4O4o90j_AhzVQ6SH91D2vnO=6ovSa=jdy2RH6yaw@mail.gmail.com>

Hi guys. I have forked pbe, then I change stuff, I commit, and then I push
to my fork. Then I download the original one (not my fork), I did a pull of
my fork, and now I want to push it back. So, I tried:

git push
https://github.com/SquareBracketAssociates/PharoByExample-english.git master
Username:
Password:
error: The requested URL returned error: 403 while accessing
https://github.com/SquareBracketAssociates/PharoByExample-english.git/info/refs

fatal: HTTP request failed



I am totally newbie with this tool, so any help is really appreciated.

Thanks

-- 
Mariano
http://marianopeck.wordpress.com
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://www.iam.unibe.ch/pipermail/sbe-discussion/attachments/20110908/eb5f4835/attachment.html>

From maxleske at gmail.com  Thu Sep  8 18:31:01 2011
From: maxleske at gmail.com (Max Leske)
Date: Thu, 8 Sep 2011 18:31:01 +0200
Subject: [sbe-discussion] Re: Cannot push to github
In-Reply-To: <CAA+-=mU_8K4O4o90j_AhzVQ6SH91D2vnO=6ovSa=jdy2RH6yaw@mail.gmail.com>
References: <CAA+-=mU_8K4O4o90j_AhzVQ6SH91D2vnO=6ovSa=jdy2RH6yaw@mail.gmail.com>
Message-ID: <ED11ED3C-0123-42FC-AE44-A666C74345B3@gmail.com>

Issue a pull request. in your forked repo, click on the button at the top named "pull request".

Cheers,
Max


On 08.09.2011, at 18:01, Mariano Martinez Peck wrote:

> Hi guys. I have forked pbe, then I change stuff, I commit, and then I push to my fork. Then I download the original one (not my fork), I did a pull of my fork, and now I want to push it back. So, I tried:
> 
> git push https://github.com/SquareBracketAssociates/PharoByExample-english.git master
> Username: 
> Password: 
> error: The requested URL returned error: 403 while accessing https://github.com/SquareBracketAssociates/PharoByExample-english.git/info/refs
> 
> fatal: HTTP request failed
> 
> 
> 
> I am totally newbie with this tool, so any help is really appreciated.
> 
> Thanks
> 
> -- 
> Mariano
> http://marianopeck.wordpress.com
> 
> _______________________________________________
> Sbe-discussion mailing list
> Sbe-discussion at iam.unibe.ch
> https://www.iam.unibe.ch/mailman/listinfo/sbe-discussion

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://www.iam.unibe.ch/pipermail/sbe-discussion/attachments/20110908/4334c4cb/attachment.html>

From marianopeck at gmail.com  Thu Sep  8 19:04:33 2011
From: marianopeck at gmail.com (Mariano Martinez Peck)
Date: Thu, 8 Sep 2011 19:04:33 +0200
Subject: [sbe-discussion] Re: Cannot push to github
In-Reply-To: <ED11ED3C-0123-42FC-AE44-A666C74345B3@gmail.com>
References: <CAA+-=mU_8K4O4o90j_AhzVQ6SH91D2vnO=6ovSa=jdy2RH6yaw@mail.gmail.com>
	<ED11ED3C-0123-42FC-AE44-A666C74345B3@gmail.com>
Message-ID: <CAA+-=mUw3=aX4p--g2wvinK4x_aekRJxXS+22oXHekZ5exnV7w@mail.gmail.com>

On Thu, Sep 8, 2011 at 6:31 PM, Max Leske <maxleske at gmail.com> wrote:

> Issue a pull request. in your forked repo, click on the button at the top
> named "pull request".
>
>
Thanks. Just done it. Now? that's all?


> Cheers,
> Max
>
>
> On 08.09.2011, at 18:01, Mariano Martinez Peck wrote:
>
> Hi guys. I have forked pbe, then I change stuff, I commit, and then I push
> to my fork. Then I download the original one (not my fork), I did a pull of
> my fork, and now I want to push it back. So, I tried:
>
> git push
> https://github.com/SquareBracketAssociates/PharoByExample-english.gitmaster
> Username:
> Password:
> error: The requested URL returned error: 403 while accessing
> https://github.com/SquareBracketAssociates/PharoByExample-english.git/info/refs
>
> fatal: HTTP request failed
>
>
>
> I am totally newbie with this tool, so any help is really appreciated.
>
> Thanks
>
> --
> Mariano
> http://marianopeck.wordpress.com
>
> _______________________________________________
> Sbe-discussion mailing list
> Sbe-discussion at iam.unibe.ch
> https://www.iam.unibe.ch/mailman/listinfo/sbe-discussion
>
>
>
> _______________________________________________
> Sbe-discussion mailing list
> Sbe-discussion at iam.unibe.ch
> https://www.iam.unibe.ch/mailman/listinfo/sbe-discussion
>
>


-- 
Mariano
http://marianopeck.wordpress.com
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://www.iam.unibe.ch/pipermail/sbe-discussion/attachments/20110908/ff396f4d/attachment.html>

From maxleske at gmail.com  Thu Sep  8 19:49:37 2011
From: maxleske at gmail.com (Max Leske)
Date: Thu, 8 Sep 2011 19:49:37 +0200
Subject: [sbe-discussion] Re: Cannot push to github
In-Reply-To: <CAA+-=mUw3=aX4p--g2wvinK4x_aekRJxXS+22oXHekZ5exnV7w@mail.gmail.com>
References: <CAA+-=mU_8K4O4o90j_AhzVQ6SH91D2vnO=6ovSa=jdy2RH6yaw@mail.gmail.com>
	<ED11ED3C-0123-42FC-AE44-A666C74345B3@gmail.com>
	<CAA+-=mUw3=aX4p--g2wvinK4x_aekRJxXS+22oXHekZ5exnV7w@mail.gmail.com>
Message-ID: <063B56CB-32F7-4397-8600-E64011AAD596@gmail.com>

Now it should be the responsibility of the maintainers to merge your commit with the main repository. Might take a while though.

At least, that's how I've done it so far.

Max


On 08.09.2011, at 19:04, Mariano Martinez Peck wrote:

> 
> 
> On Thu, Sep 8, 2011 at 6:31 PM, Max Leske <maxleske at gmail.com> wrote:
> Issue a pull request. in your forked repo, click on the button at the top named "pull request".
> 
> 
> Thanks. Just done it. Now? that's all?
>  
> Cheers,
> Max
> 
> 
> On 08.09.2011, at 18:01, Mariano Martinez Peck wrote:
> 
>> Hi guys. I have forked pbe, then I change stuff, I commit, and then I push to my fork. Then I download the original one (not my fork), I did a pull of my fork, and now I want to push it back. So, I tried:
>> 
>> git push https://github.com/SquareBracketAssociates/PharoByExample-english.git master
>> Username: 
>> Password: 
>> error: The requested URL returned error: 403 while accessing https://github.com/SquareBracketAssociates/PharoByExample-english.git/info/refs
>> 
>> fatal: HTTP request failed
>> 
>> 
>> 
>> I am totally newbie with this tool, so any help is really appreciated.
>> 
>> Thanks
>> 
>> -- 
>> Mariano
>> http://marianopeck.wordpress.com
>> 
>> _______________________________________________
>> Sbe-discussion mailing list
>> Sbe-discussion at iam.unibe.ch
>> https://www.iam.unibe.ch/mailman/listinfo/sbe-discussion
> 
> 
> _______________________________________________
> Sbe-discussion mailing list
> Sbe-discussion at iam.unibe.ch
> https://www.iam.unibe.ch/mailman/listinfo/sbe-discussion
> 
> 
> 
> 
> -- 
> Mariano
> http://marianopeck.wordpress.com
> 
> _______________________________________________
> Sbe-discussion mailing list
> Sbe-discussion at iam.unibe.ch
> https://www.iam.unibe.ch/mailman/listinfo/sbe-discussion

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://www.iam.unibe.ch/pipermail/sbe-discussion/attachments/20110908/19734202/attachment-0001.html>

From marianopeck at gmail.com  Thu Sep  8 20:01:14 2011
From: marianopeck at gmail.com (Mariano Martinez Peck)
Date: Thu, 8 Sep 2011 20:01:14 +0200
Subject: [sbe-discussion] Re: Cannot push to github
In-Reply-To: <063B56CB-32F7-4397-8600-E64011AAD596@gmail.com>
References: <CAA+-=mU_8K4O4o90j_AhzVQ6SH91D2vnO=6ovSa=jdy2RH6yaw@mail.gmail.com>
	<ED11ED3C-0123-42FC-AE44-A666C74345B3@gmail.com>
	<CAA+-=mUw3=aX4p--g2wvinK4x_aekRJxXS+22oXHekZ5exnV7w@mail.gmail.com>
	<063B56CB-32F7-4397-8600-E64011AAD596@gmail.com>
Message-ID: <CAA+-=mVnx_ijPL8J1TcPk3M=KpW+7znoF39D=kTDYWzhkV8YQA@mail.gmail.com>

Thanks Max.

On Thu, Sep 8, 2011 at 7:49 PM, Max Leske <maxleske at gmail.com> wrote:

> Now it should be the responsibility of the maintainers to merge your commit
> with the main repository. Might take a while though.
>
> At least, that's how I've done it so far.
>
> Max
>
>
> On 08.09.2011, at 19:04, Mariano Martinez Peck wrote:
>
>
>
> On Thu, Sep 8, 2011 at 6:31 PM, Max Leske <maxleske at gmail.com> wrote:
>
>> Issue a pull request. in your forked repo, click on the button at the top
>> named "pull request".
>>
>>
> Thanks. Just done it. Now? that's all?
>
>
>> Cheers,
>> Max
>>
>>
>> On 08.09.2011, at 18:01, Mariano Martinez Peck wrote:
>>
>> Hi guys. I have forked pbe, then I change stuff, I commit, and then I push
>> to my fork. Then I download the original one (not my fork), I did a pull of
>> my fork, and now I want to push it back. So, I tried:
>>
>> git push
>> https://github.com/SquareBracketAssociates/PharoByExample-english.gitmaster
>> Username:
>> Password:
>> error: The requested URL returned error: 403 while accessing
>> https://github.com/SquareBracketAssociates/PharoByExample-english.git/info/refs
>>
>> fatal: HTTP request failed
>>
>>
>>
>> I am totally newbie with this tool, so any help is really appreciated.
>>
>> Thanks
>>
>> --
>> Mariano
>> http://marianopeck.wordpress.com
>>
>> _______________________________________________
>> Sbe-discussion mailing list
>> Sbe-discussion at iam.unibe.ch
>> https://www.iam.unibe.ch/mailman/listinfo/sbe-discussion
>>
>>
>>
>> _______________________________________________
>> Sbe-discussion mailing list
>> Sbe-discussion at iam.unibe.ch
>> https://www.iam.unibe.ch/mailman/listinfo/sbe-discussion
>>
>>
>
>
> --
> Mariano
> http://marianopeck.wordpress.com
>
> _______________________________________________
> Sbe-discussion mailing list
> Sbe-discussion at iam.unibe.ch
> https://www.iam.unibe.ch/mailman/listinfo/sbe-discussion
>
>
>
> _______________________________________________
> Sbe-discussion mailing list
> Sbe-discussion at iam.unibe.ch
> https://www.iam.unibe.ch/mailman/listinfo/sbe-discussion
>
>


-- 
Mariano
http://marianopeck.wordpress.com
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://www.iam.unibe.ch/pipermail/sbe-discussion/attachments/20110908/2230de6e/attachment.html>

From damien.pollet at inria.fr  Thu Sep  8 21:05:32 2011
From: damien.pollet at inria.fr (Damien Pollet)
Date: Thu, 8 Sep 2011 21:05:32 +0200
Subject: [sbe-discussion] Re: Cannot push to github
In-Reply-To: <CAA+-=mU_8K4O4o90j_AhzVQ6SH91D2vnO=6ovSa=jdy2RH6yaw@mail.gmail.com>
References: <CAA+-=mU_8K4O4o90j_AhzVQ6SH91D2vnO=6ovSa=jdy2RH6yaw@mail.gmail.com>
Message-ID: <2DFECC4A-DA51-41E0-B6CC-D7B36CC6A643@inria.fr>

On Sep 8, 2011, at 18:01, Mariano Martinez Peck wrote:

> I am totally newbie with this tool, so any help is really appreciated.

You have to have authoring access to the main repo. If yes you could have cloned this one and worked/committed/pushed directly to it. Note that on github there are public read-only URLs, and write-enabled URLs; you have to pay attention to copy the good one when you do the clone.

With a fork, if you don't have authoring access or if you want your changes reviewed, go for the pull request.

But with a fork AND authoring access to the upstream, you can:
- add a remote for the upstream
- fetch the upstream repo (not pull)
- checkout upstream/master
- merge master into it (master having your local changes)
- push to upstream

We can have a look someday for the details but now I should be doing slides?

--
Damien Pollet
type less, do more [ | ] http://people.untyped.org/damien.pollet





From stephane.ducasse at free.fr  Sat Sep 10 12:44:48 2011
From: stephane.ducasse at free.fr (stephane ducasse)
Date: Sat, 10 Sep 2011 12:44:48 +0200
Subject: [sbe-discussion] Re: Cannot push to github
In-Reply-To: <2DFECC4A-DA51-41E0-B6CC-D7B36CC6A643@inria.fr>
References: <CAA+-=mU_8K4O4o90j_AhzVQ6SH91D2vnO=6ovSa=jdy2RH6yaw@mail.gmail.com>
	<2DFECC4A-DA51-41E0-B6CC-D7B36CC6A643@inria.fr>
Message-ID: <7A7CD24A-049F-4C2E-AD93-FE6DD4451B5C@free.fr>

for me upstream donwstream is not simple to understand.

Stef

On Sep 8, 2011, at 9:05 PM, Damien Pollet wrote:

> On Sep 8, 2011, at 18:01, Mariano Martinez Peck wrote:
> 
>> I am totally newbie with this tool, so any help is really appreciated.
> 
> You have to have authoring access to the main repo. If yes you could have cloned this one and worked/committed/pushed directly to it. Note that on github there are public read-only URLs, and write-enabled URLs; you have to pay attention to copy the good one when you do the clone.
> 
> With a fork, if you don't have authoring access or if you want your changes reviewed, go for the pull request.
> 
> But with a fork AND authoring access to the upstream, you can:
> - add a remote for the upstream
> - fetch the upstream repo (not pull)
> - checkout upstream/master
> - merge master into it (master having your local changes)
> - push to upstream
> 
> We can have a look someday for the details but now I should be doing slides?
> 
> --
> Damien Pollet
> type less, do more [ | ] http://people.untyped.org/damien.pollet
> 
> 
> 
> 
> _______________________________________________
> Sbe-discussion mailing list
> Sbe-discussion at iam.unibe.ch
> https://www.iam.unibe.ch/mailman/listinfo/sbe-discussion
> 



From oscar at iam.unibe.ch  Sat Sep 10 13:50:59 2011
From: oscar at iam.unibe.ch (Oscar Nierstrasz)
Date: Sat, 10 Sep 2011 13:50:59 +0200
Subject: [sbe-discussion] Re: Cannot push to github
In-Reply-To: <7A7CD24A-049F-4C2E-AD93-FE6DD4451B5C@free.fr>
References: <CAA+-=mU_8K4O4o90j_AhzVQ6SH91D2vnO=6ovSa=jdy2RH6yaw@mail.gmail.com>
	<2DFECC4A-DA51-41E0-B6CC-D7B36CC6A643@inria.fr>
	<7A7CD24A-049F-4C2E-AD93-FE6DD4451B5C@free.fr>
Message-ID: <C6298248-1C98-4C41-9162-55511EF98AB1@iam.unibe.ch>


You are downstream (in Nice), the master is upstream (in Switzerland).

;-)

o

On 10 Sep 2011, at 12:44, stephane ducasse wrote:

> for me upstream donwstream is not simple to understand.
> 
> Stef
> 
> On Sep 8, 2011, at 9:05 PM, Damien Pollet wrote:
> 
>> On Sep 8, 2011, at 18:01, Mariano Martinez Peck wrote:
>> 
>>> I am totally newbie with this tool, so any help is really appreciated.
>> 
>> You have to have authoring access to the main repo. If yes you could have cloned this one and worked/committed/pushed directly to it. Note that on github there are public read-only URLs, and write-enabled URLs; you have to pay attention to copy the good one when you do the clone.
>> 
>> With a fork, if you don't have authoring access or if you want your changes reviewed, go for the pull request.
>> 
>> But with a fork AND authoring access to the upstream, you can:
>> - add a remote for the upstream
>> - fetch the upstream repo (not pull)
>> - checkout upstream/master
>> - merge master into it (master having your local changes)
>> - push to upstream
>> 
>> We can have a look someday for the details but now I should be doing slides?
>> 
>> --
>> Damien Pollet
>> type less, do more [ | ] http://people.untyped.org/damien.pollet
>> 
>> 
>> 
>> 
>> _______________________________________________
>> Sbe-discussion mailing list
>> Sbe-discussion at iam.unibe.ch
>> https://www.iam.unibe.ch/mailman/listinfo/sbe-discussion
>> 
> 
> 
> _______________________________________________
> Sbe-discussion mailing list
> Sbe-discussion at iam.unibe.ch
> https://www.iam.unibe.ch/mailman/listinfo/sbe-discussion



From marianopeck at gmail.com  Sat Sep 10 23:10:44 2011
From: marianopeck at gmail.com (Mariano Martinez Peck)
Date: Sat, 10 Sep 2011 23:10:44 +0200
Subject: [sbe-discussion] Re: Cannot push to github
In-Reply-To: <063B56CB-32F7-4397-8600-E64011AAD596@gmail.com>
References: <CAA+-=mU_8K4O4o90j_AhzVQ6SH91D2vnO=6ovSa=jdy2RH6yaw@mail.gmail.com>
	<ED11ED3C-0123-42FC-AE44-A666C74345B3@gmail.com>
	<CAA+-=mUw3=aX4p--g2wvinK4x_aekRJxXS+22oXHekZ5exnV7w@mail.gmail.com>
	<063B56CB-32F7-4397-8600-E64011AAD596@gmail.com>
Message-ID: <CAA+-=mWbnXpoxxQi0qcUU2ReqUXQyRq4huabCmjQ1Lpgmz_NVw@mail.gmail.com>

On Thu, Sep 8, 2011 at 7:49 PM, Max Leske <maxleske at gmail.com> wrote:

> Now it should be the responsibility of the maintainers to merge your commit
> with the main repository. Might take a while though.
>
> At least, that's how I've done it so far.
>
>
So now Stef told me there is a new version. I take my repo and I do: git
pull and I get

remote: Counting objects: 71, done.
remote: Compressing objects: 100% (39/39), done.
remote: Total 57 (delta 30), reused 45 (delta 18)
Unpacking objects: 100% (57/57), done.
>From https://github.com/SquareBracketAssociates/PharoByExample-english
   9404ea6..c0c6772  master     -> origin/master
Auto-merging LittleNumbers/LittleNumbers.tex
CONFLICT (content): Merge conflict in LittleNumbers/LittleNumbers.tex
Auto-merging common.tex
CONFLICT (content): Merge conflict in common.tex
Automatic merge failed; fix conflicts and then commit the result.


and of course, I get all the fucking <<<<<<

So....how can I at least do a revert of my changes and get all the latest
version again?


Max
>
>
> On 08.09.2011, at 19:04, Mariano Martinez Peck wrote:
>
>
>
> On Thu, Sep 8, 2011 at 6:31 PM, Max Leske <maxleske at gmail.com> wrote:
>
>> Issue a pull request. in your forked repo, click on the button at the top
>> named "pull request".
>>
>>
> Thanks. Just done it. Now? that's all?
>
>
>> Cheers,
>> Max
>>
>>
>> On 08.09.2011, at 18:01, Mariano Martinez Peck wrote:
>>
>> Hi guys. I have forked pbe, then I change stuff, I commit, and then I push
>> to my fork. Then I download the original one (not my fork), I did a pull of
>> my fork, and now I want to push it back. So, I tried:
>>
>> git push
>> https://github.com/SquareBracketAssociates/PharoByExample-english.gitmaster
>> Username:
>> Password:
>> error: The requested URL returned error: 403 while accessing
>> https://github.com/SquareBracketAssociates/PharoByExample-english.git/info/refs
>>
>> fatal: HTTP request failed
>>
>>
>>
>> I am totally newbie with this tool, so any help is really appreciated.
>>
>> Thanks
>>
>> --
>> Mariano
>> http://marianopeck.wordpress.com
>>
>> _______________________________________________
>> Sbe-discussion mailing list
>> Sbe-discussion at iam.unibe.ch
>> https://www.iam.unibe.ch/mailman/listinfo/sbe-discussion
>>
>>
>>
>> _______________________________________________
>> Sbe-discussion mailing list
>> Sbe-discussion at iam.unibe.ch
>> https://www.iam.unibe.ch/mailman/listinfo/sbe-discussion
>>
>>
>
>
> --
> Mariano
> http://marianopeck.wordpress.com
>
> _______________________________________________
> Sbe-discussion mailing list
> Sbe-discussion at iam.unibe.ch
> https://www.iam.unibe.ch/mailman/listinfo/sbe-discussion
>
>
>
> _______________________________________________
> Sbe-discussion mailing list
> Sbe-discussion at iam.unibe.ch
> https://www.iam.unibe.ch/mailman/listinfo/sbe-discussion
>
>


-- 
Mariano
http://marianopeck.wordpress.com
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://www.iam.unibe.ch/pipermail/sbe-discussion/attachments/20110910/9674073a/attachment-0001.html>

From damien.cassou at gmail.com  Sat Sep 10 23:30:49 2011
From: damien.cassou at gmail.com (Damien Cassou)
Date: Sat, 10 Sep 2011 23:30:49 +0200
Subject: [sbe-discussion] Re: Cannot push to github
In-Reply-To: <CAA+-=mWbnXpoxxQi0qcUU2ReqUXQyRq4huabCmjQ1Lpgmz_NVw@mail.gmail.com>
References: <CAA+-=mU_8K4O4o90j_AhzVQ6SH91D2vnO=6ovSa=jdy2RH6yaw@mail.gmail.com>
	<ED11ED3C-0123-42FC-AE44-A666C74345B3@gmail.com>
	<CAA+-=mUw3=aX4p--g2wvinK4x_aekRJxXS+22oXHekZ5exnV7w@mail.gmail.com>
	<063B56CB-32F7-4397-8600-E64011AAD596@gmail.com>
	<CAA+-=mWbnXpoxxQi0qcUU2ReqUXQyRq4huabCmjQ1Lpgmz_NVw@mail.gmail.com>
Message-ID: <CA+y5ggjpmqJG=3c8LRPCVqyD-fGgs8=nym_qPccAiNf=aM8iAA@mail.gmail.com>

On Sat, Sep 10, 2011 at 11:10 PM, Mariano Martinez Peck
<marianopeck at gmail.com> wrote:
> and of course, I get all the fucking <<<<<<
>
> So....how can I at least do a revert of my changes and get all the latest
> version again?

Why don't you just look at the <<<< and fix them? If you want to undo
the pull, you can:

$ git reset --hard HEAD

That makes your working copy go back to your previous commit (the one
you did just before the pull). You can then make a safe copy of your
work somewhere. Now, you can revert your own work:

$ git reset --hard HEAD~1

Now, it's as if you didn't do anything (provided you made a single
commit). You should be able to pull now :

$ git pull

Bye



-- 
Damien Cassou
http://damiencassou.seasidehosting.st

"Lambdas are relegated to relative obscurity until Java makes them
popular by not having them." James Iry

From stephane.ducasse at free.fr  Sun Sep 11 08:27:25 2011
From: stephane.ducasse at free.fr (stephane ducasse)
Date: Sun, 11 Sep 2011 08:27:25 +0200
Subject: [sbe-discussion] Re: Cannot push to github
In-Reply-To: <CA+y5ggjpmqJG=3c8LRPCVqyD-fGgs8=nym_qPccAiNf=aM8iAA@mail.gmail.com>
References: <CAA+-=mU_8K4O4o90j_AhzVQ6SH91D2vnO=6ovSa=jdy2RH6yaw@mail.gmail.com>
	<ED11ED3C-0123-42FC-AE44-A666C74345B3@gmail.com>
	<CAA+-=mUw3=aX4p--g2wvinK4x_aekRJxXS+22oXHekZ5exnV7w@mail.gmail.com>
	<063B56CB-32F7-4397-8600-E64011AAD596@gmail.com>
	<CAA+-=mWbnXpoxxQi0qcUU2ReqUXQyRq4huabCmjQ1Lpgmz_NVw@mail.gmail.com>
	<CA+y5ggjpmqJG=3c8LRPCVqyD-fGgs8=nym_qPccAiNf=aM8iAA@mail.gmail.com>
Message-ID: <41F0814D-1A41-4F33-A503-9A6C6670D56C@free.fr>

Yes you need all your mind to remember that...
And since you will be stressing because you are not that smart you will end to do a copy manually before any pull or 
do pull only from time to time and commit to your local repos (and maiximise conflicts).

I wrote a lot of paper with svn and it was fulfilling my simple needs. 


Max I will look at the pull request you did on file system now. I think I hope that I will be able to do it.

Stef

>> So....how can I at least do a revert of my changes and get all the latest
>> version again?
> 
> Why don't you just look at the <<<< and fix them? If you want to undo
> the pull, you can:
> 
> $ git reset --hard HEAD
> 
> That makes your working copy go back to your previous commit (the one
> you did just before the pull). You can then make a safe copy of your
> work somewhere. Now, you can revert your own work:
> 
> $ git reset --hard HEAD~1
> 
> Now, it's as if you didn't do anything (provided you made a single
> commit). You should be able to pull now :
> 
> $ git pull
> 
> Bye
> 
> 
> 
> -- 
> Damien Cassou
> http://damiencassou.seasidehosting.st
> 
> "Lambdas are relegated to relative obscurity until Java makes them
> popular by not having them." James Iry
> _______________________________________________
> Sbe-discussion mailing list
> Sbe-discussion at iam.unibe.ch
> https://www.iam.unibe.ch/mailman/listinfo/sbe-discussion
> 



From damien.pollet at inria.fr  Sun Sep 11 17:43:57 2011
From: damien.pollet at inria.fr (Damien Pollet)
Date: Sun, 11 Sep 2011 17:43:57 +0200
Subject: [sbe-discussion] [SquareBracketAssociates/PharoByExample-english]
	ef1b8f: Merge #9
Message-ID: <4328C3AD-9AAF-40DA-B97A-D140E21E1979@inria.fr>

 Branch: refs/heads/master
 Home:   https://github.com/SquareBracketAssociates/PharoByExample-english

 Commit: ef1b8f5a8bc8637bd500deb4c08e27eedf8f59d9
     https://github.com/SquareBracketAssociates/PharoByExample-english/commit/ef1b8f5a8bc8637bd500deb4c08e27eedf8f59d9
 Author: plop <damien.pollet at gmail.com>
 Date:   2011-09-11 (Sun, 11 Sep 2011)

 Changed paths:
   R FileSystem/FileSystem.tex
 A Filesystem/Filesystem.tex
 M PBE2.tex
 M common.tex

 Log Message:
 -----------
 Merge #9


 Commit: eba2de80b8a482fea2fe9d9a4cd577319eb619ed
     https://github.com/SquareBracketAssociates/PharoByExample-english/commit/eba2de80b8a482fea2fe9d9a4cd577319eb619ed
 Author: plop <damien.pollet at gmail.com>
 Date:   2011-09-11 (Sun, 11 Sep 2011)

 Changed paths:
   M pbe1-examples.txt

 Log Message:
 -----------
 update example code after recompile


Compare: https://github.com/SquareBracketAssociates/PharoByExample-english/compare/c0c6772...eba2de8


--
Damien Pollet
type less, do more [ | ] http://people.untyped.org/damien.pollet