Re: [cdt-dev] Git repos are now live

[Andrew Gvozdev <angvoz.dev@xxxxxxxxx>]

I do not think there should be any policy for local branches for one's local repository but recommendation (unless we decide to develop on bug-labeled branches and push these branches to main repo). I think it makes more sense to do rebase due to clean history, definitely for regular patches. You may need merge for big development if you do it in parallel on another branch but you will know when you really need it. For example I do it for scanner discovery to save on merging times (got quite a history on the branch) and keep the history in sync with changing API in master. The disadvantage of rebase is that it rewrites the history, so exact context when you wrote the code is lost.

You can set rebase flag it in UI:

- Select you repository in Git Repositories view

- right click then select Open Properties View

- click Edit icon

- push New Entry button

- add Key=branch.master.rebase Value=true

Andrew

On Sat, Jun 25, 2011 at 11:42 AM, Sergey Prigogin <eclipse.sprigogin@xxxxxxxxx> wrote:

Is there a consensus on the pull policy for local branches tracking remote ones? Should it be rebase or merge?

-sergey

On Sat, Jun 25, 2011 at 7:56 AM, Schaefer, Doug <Doug.Schaefer@xxxxxxxxxxxxx> wrote:

BTW, Congrats to Sergey for being the first to commit a change to the new repos. :)

So, as a tip, to get the latest from the repo, checkout the branch you are interested in (master or cdt_8_0 or ...) and do a Pull. That will do a fetch and should do a fast forward merge (which isn't really a merge at all) to get your branch pointer updated. Now it's when you have changes on your copy of the branch that haven't been pushed yet when you see a real merge happen.

That brings up rebase, but I'll leave that for now as it gets complicated.

Doug.

> -----Original Message-----
> From: cdt-dev-bounces@xxxxxxxxxxx [mailto:cdt-dev-bounces@xxxxxxxxxxx]

> On Behalf Of Schaefer, Doug
> Sent: Saturday, June 25, 2011 10:46 AM

> To: CDT General developers list.
> Subject: Re: [cdt-dev] Git repos are now live
>
> We'll have a lot of things to clean up like that. I have too many things on the
> go at the moment. But I'm sure someone will step up, or we'll have to wait
> until I clear some room.
>
> BTW, you can check my videos on youtube that I posted earlier to get you
> going. They cover checking out the repo and creating patches.
>
> Doug.
>
> > -----Original Message-----
> > From: cdt-dev-bounces@xxxxxxxxxxx [mailto:cdt-dev-
> bounces@xxxxxxxxxxx]
> > On Behalf Of Axel Müller
> > Sent: Saturday, June 25, 2011 5:01 AM
> > To: CDT General developers list.
> > Subject: Re: [cdt-dev] Git repos are now live
> >
> > Hi,
> >
> > when will the Wiki be updated for non-commiters?
> >
> > http://wiki.eclipse.org/Getting_started_with_CDT_development mentions
> > only CVS
> >
> >   Axel
> >
> > Am Samstag 25 Juni 2011, um 01:15:48 schrieb Schaefer, Doug:
> > > Hey gang,
> > >
> > > Huge thanks to James who's done the conversion and verified the repo.
> > > We're good to go. See them live at git.ecilpse.org in your web browser.
> > >
> > > I've created the CDT_8_0 tag for the final build and created the
> > > cdt_8_0 branch from there. And if there's any more proof I need that
> > > git is good, it was extremely easy and fast to create those and
> > > visualize them in the History view.
> > >
> > > I'll leave the test3 repo up so you can practice if needed. I'll
> > > remove it in a couple of weeks or so.
> > >
> > > Finally, note to the EDC gang, there were commits after our final build.
> > > They are not on the cdt_8_0 branch.
> > >
> > > Doug
> >
> > _______________________________________________
> > cdt-dev mailing list
> > cdt-dev@xxxxxxxxxxx
> > https://dev.eclipse.org/mailman/listinfo/cdt-dev
> _______________________________________________
> cdt-dev mailing list
> cdt-dev@xxxxxxxxxxx
> https://dev.eclipse.org/mailman/listinfo/cdt-dev
_______________________________________________
cdt-dev mailing list
cdt-dev@xxxxxxxxxxx
https://dev.eclipse.org/mailman/listinfo/cdt-dev

_______________________________________________
cdt-dev mailing list
cdt-dev@xxxxxxxxxxx
https://dev.eclipse.org/mailman/listinfo/cdt-dev