Cannot push to github
Locked
 
|
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 [hidden email] https://www.iam.unibe.ch/mailman/listinfo/sbe-discussion |
|
|
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: _______________________________________________ Sbe-discussion mailing list [hidden email] https://www.iam.unibe.ch/mailman/listinfo/sbe-discussion |
Re: Cannot push to github
|
|
On Thu, Sep 8, 2011 at 6:31 PM, Max Leske <[hidden email]> wrote:
Thanks. Just done it. Now? that's all?
-- Mariano http://marianopeck.wordpress.com _______________________________________________ Sbe-discussion mailing list [hidden email] https://www.iam.unibe.ch/mailman/listinfo/sbe-discussion |
|
|
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:
_______________________________________________ Sbe-discussion mailing list [hidden email] https://www.iam.unibe.ch/mailman/listinfo/sbe-discussion |
Re: Cannot push to github
|
|
Thanks Max.
On Thu, Sep 8, 2011 at 7:49 PM, Max Leske <[hidden email]> wrote:
-- Mariano http://marianopeck.wordpress.com _______________________________________________ Sbe-discussion mailing list [hidden email] https://www.iam.unibe.ch/mailman/listinfo/sbe-discussion |
|
|
In reply to this post by Mariano Martinez Peck
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 [hidden email] https://www.iam.unibe.ch/mailman/listinfo/sbe-discussion |
|
|
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 > [hidden email] > https://www.iam.unibe.ch/mailman/listinfo/sbe-discussion > _______________________________________________ Sbe-discussion mailing list [hidden email] https://www.iam.unibe.ch/mailman/listinfo/sbe-discussion |
|
|
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 >> [hidden email] >> https://www.iam.unibe.ch/mailman/listinfo/sbe-discussion >> > > > _______________________________________________ > Sbe-discussion mailing list > [hidden email] > https://www.iam.unibe.ch/mailman/listinfo/sbe-discussion _______________________________________________ Sbe-discussion mailing list [hidden email] https://www.iam.unibe.ch/mailman/listinfo/sbe-discussion |
Re: Cannot push to github
|
|
In reply to this post by Max Leske
On Thu, Sep 8, 2011 at 7:49 PM, Max Leske <[hidden email]> wrote:
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?
-- Mariano http://marianopeck.wordpress.com _______________________________________________ Sbe-discussion mailing list [hidden email] https://www.iam.unibe.ch/mailman/listinfo/sbe-discussion |
|
|
On Sat, Sep 10, 2011 at 11:10 PM, Mariano Martinez Peck
<[hidden email]> 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 _______________________________________________ Sbe-discussion mailing list [hidden email] https://www.iam.unibe.ch/mailman/listinfo/sbe-discussion |
|
|
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 > [hidden email] > https://www.iam.unibe.ch/mailman/listinfo/sbe-discussion > _______________________________________________ Sbe-discussion mailing list [hidden email] https://www.iam.unibe.ch/mailman/listinfo/sbe-discussion |
«
Return to Pharo By Example
|
1 view|%1 views
| Free forum by Nabble | Edit this page |