github help + IE7 compatibility

Previous Topic Next Topic
 
classic Classic list List threaded Threaded
6 messages Options
Reply | Threaded
Open this post in threaded view
|

github help + IE7 compatibility

laurent laffont
Hi,

I've managed to make Amber IDE works on IE7. 2 unit tests failing.

Now I would like to create pull requests for this stuff (and other improvements on my branch). Someone told me that I should create one branch per functionality I want to submit. How can I do this ? (git newbie) 

I suppose I need to create a branch that forks Nicolas/master then from that create branches and cherry pick relevant commits from my master branch ?

Cheers,

Laurent Laffont - @lolgzs

Reply | Threaded
Open this post in threaded view
|

Re: github help + IE7 compatibility

Hannes Hirzel
On 12/1/11, laurent laffont <[hidden email]> wrote:

> Hi,
>
> I've managed to make Amber IDE works on IE7. 2 unit tests failing.
>
> Now I would like to create pull requests for this stuff (and other
> improvements on my branch). Someone told me that I should create one branch
> per functionality I want to submit. How can I do this ? (git newbie)
>
> I suppose I need to create a branch that forks Nicolas/master then from
> that create branches and cherry pick relevant commits from my master branch
> ?
I suppose so too.

 I'd like as well to see short instructions how to do so.

To get a login on github and to create a branch of Nicolas/master is easy.
Then to clone it to the local directory of the development macnhine as
well as it is the same as getting it from Nicolas'.
But what is the command to send the my local changes back to my github
repository?
(would be something like "push" in Mercurial)
And what is the command to resynchronize my branch with what Nicolas
has done in the meantime?

--Hannes
Reply | Threaded
Open this post in threaded view
|

Re: github help + IE7 compatibility

Nicolas Petton
In reply to this post by laurent laffont
On Thu, 2011-12-01 at 10:58 +0100, laurent laffont wrote:

> Hi,
>
>
> I've managed to make Amber IDE works on IE7. 2 unit tests failing.
>
>
> Now I would like to create pull requests for this stuff (and other
> improvements on my branch). Someone told me that I should create one
> branch per functionality I want to submit. How can I do this ? (git
> newbie)
>
>
> I suppose I need to create a branch that forks Nicolas/master then
> from that create branches and cherry pick relevant commits from my
> master branch ?

If your master branch is clean (no other changes), then I'll just pull.
I wouldn't bother creating a branch after the fact, and next time you
can create a branch before making changes :)

Cheers,
Nico  
>
>
> Cheers,
>
>
> Laurent Laffont - @lolgzs
>
>


Reply | Threaded
Open this post in threaded view
|

Re: github help + IE7 compatibility

Nicolas Petton
In reply to this post by Hannes Hirzel
On Thu, 2011-12-01 at 10:51 +0000, H. Hirzel wrote:

> On 12/1/11, laurent laffont <[hidden email]> wrote:
> > Hi,
> >
> > I've managed to make Amber IDE works on IE7. 2 unit tests failing.
> >
> > Now I would like to create pull requests for this stuff (and other
> > improvements on my branch). Someone told me that I should create one branch
> > per functionality I want to submit. How can I do this ? (git newbie)
> >
> > I suppose I need to create a branch that forks Nicolas/master then from
> > that create branches and cherry pick relevant commits from my master branch
> > ?
> I suppose so too.
>
>  I'd like as well to see short instructions how to do so.
>

I should warn you that I'm not a git expert :)
There are good resources though:
http://help.github.com/fork-a-repo/
https://github.com/blog/120-new-to-git


> To get a login on github and to create a branch of Nicolas/master is easy.
> Then to clone it to the local directory of the development macnhine as
> well as it is the same as getting it from Nicolas'.
> But what is the command to send the my local changes back to my github
> repository?

git push does that: git push origin master

> (would be something like "push" in Mercurial)
> And what is the command to resynchronize my branch with what Nicolas
> has done in the meantime?

git fetch nicolas
git merge nicolas/master master

Maybe you'll have to track my repo first:
git remote add nicolas https://github.com/NicolasPetton/amber.git

Cheers,
Nico

>
> --Hannes


Reply | Threaded
Open this post in threaded view
|

Re: github help + IE7 compatibility

Nicolas Petton
In reply to this post by laurent laffont
I merged, thanks Laurent!

Nico

On Thu, 2011-12-01 at 10:58 +0100, laurent laffont wrote:

> Hi,
>
>
> I've managed to make Amber IDE works on IE7. 2 unit tests failing.
>
>
> Now I would like to create pull requests for this stuff (and other
> improvements on my branch). Someone told me that I should create one
> branch per functionality I want to submit. How can I do this ? (git
> newbie)
>
>
> I suppose I need to create a branch that forks Nicolas/master then
> from that create branches and cherry pick relevant commits from my
> master branch ?
>
>
> Cheers,
>
>
> Laurent Laffont - @lolgzs
>
>


Reply | Threaded
Open this post in threaded view
|

Re: github help + IE7 compatibility

laurent laffont
oh ... cool !

Laurent


On Fri, Dec 2, 2011 at 3:51 PM, Nicolas Petton <[hidden email]> wrote:
I merged, thanks Laurent!

Nico

On Thu, 2011-12-01 at 10:58 +0100, laurent laffont wrote:
> Hi,
>
>
> I've managed to make Amber IDE works on IE7. 2 unit tests failing.
>
>
> Now I would like to create pull requests for this stuff (and other
> improvements on my branch). Someone told me that I should create one
> branch per functionality I want to submit. How can I do this ? (git
> newbie)
>
>
> I suppose I need to create a branch that forks Nicolas/master then
> from that create branches and cherry pick relevant commits from my
> master branch ?
>
>
> Cheers,
>
>
> Laurent Laffont - @lolgzs
>
>