Re: [Sugar-devel] Managing github forks

I wonder if keeping origin on read only git, upstream on the main repo ssh and fork on the fork ssh would work well. You wouldn't risk to accidentally push to main repo that way. On 29 May 2013 14:53, Manuel Quiñones wrote: > 2013/5/29 Daniel Narvaez : > > On 28 May 2013 02:10, Manuel Quiñones

Re: [Sugar-devel] Managing github forks

2013/5/29 Daniel Narvaez : > On 28 May 2013 02:10, Manuel Quiñones wrote: >> >> >> Yes, this works well but you should be more careful whlie hacking, >> because a wrong push could mess the main repository (calling commands >> in the wrong order, for example). Personally I hack in my own fork, >>

Re: [Sugar-devel] Managing github forks

On 28 May 2013 02:10, Manuel Quiñones wrote: > > Yes, this works well but you should be more careful whlie hacking, > because a wrong push could mess the main repository (calling commands > in the wrong order, for example). Personally I hack in my own fork, > and when I put my reviewer hat I swi

Re: [Sugar-devel] Managing github forks

2013/5/29 William Orr : > Why not rebase to update? The current guide can lead to some messy merge > commits. I don't know Will. Maybe you are right. What we do is the recommended way in github: https://help.github.com/articles/fork-a-repo#step-3-configure-remotes I don't think you can mess yo

Re: [Sugar-devel] Managing github forks

Why not rebase to update? The current guide can lead to some messy merge commits. I guess you can fix it with an interactive rebase later, but this has always been the cleanest way I've found to keep my forks up to date as well as enabling clean merges of my forks. Manuel Quiñones

Re: [Sugar-devel] Managing github forks

Hey William, 2013/5/28 Will Orr : > Hello, > > When doing work on my feature branch, usually I do a git pull --rebase origin > master to update, that way my patches will cleanly apply to the master branch > of the project when I file my pull request. I avoid merge commits this way as > well. >

Re: [Sugar-devel] Managing github forks

Hello, When doing work on my feature branch, usually I do a git pull --rebase origin master to update, that way my patches will cleanly apply to the master branch of the project when I file my pull request. I avoid merge commits this way as well. The downside is that I might be messing with

Re: [Sugar-devel] Managing github forks

2013/5/26 Daniel Narvaez : > Hello, > > I've been playing with a slightly different workflow with github > repositories and it seems to work well for me. > > I keep origin to be g...@github.com/sugarlabs/module and I add a fork remote > pointing to g...@github.com/dnarvaez/module. > > To send pull

[Sugar-devel] Managing github forks

Hello, I've been playing with a slightly different workflow with github repositories and it seems to work well for me. I keep origin to be g...@github.com/sugarlabs/module and I add a fork remote pointing to g...@github.com/dnarvaez/module. To send pull requests I just git push fork myfeature