[amp-dev] Fwd: [mylyn-dev] [mylyn-integrators] Git migration complete

[Miles Parker <milesparker@xxxxxxxxx>]

Good advice form Mylyn list.

Begin forwarded message:

From: Steffen Pingel <steffen.pingel@xxxxxxxxxxx>

Date: July 8, 2011 3:02:51 PM PDT

To: Mylyn developer discussions <mylyn-dev@xxxxxxxxxxx>

Subject: Re: [mylyn-dev] [mylyn-integrators] Git migration complete

Reply-To: Mylyn developer discussions <mylyn-dev@xxxxxxxxxxx>

Thanks for the links! I have added a section on Git to the contributor reference: http://wiki.eclipse.org/Mylyn/Contributor_Reference#Git

Steffen

On Fri, Jul 8, 2011 at 2:10 PM, Benjamin Muskalla <benjamin.muskalla@xxxxxxxxxxx> wrote:

+1 for always rebase.

See also http://kernel.org/pub/software/scm/git/docs/git-config.html

branch.autosetuprebase

=> git config branch.autosetuprebase always

Another resource for CVS committers is the "Git workflows for CVS users" from the Platform team:

http://wiki.eclipse.org/Platform-releng/Git_Workflows#Cross-referencing_between_bugzilla_and_git

We should just get rid of the paragraph "Cross-referencing between bugzilla and git" ;)

Benny

On Fri, Jul 8, 2011 at 1:44 PM, Steffen Pingel <steffen.pingel@xxxxxxxxxxx> wrote:

Git has significant benefits buts also adds complexity. There are a few things to keep in mind when committing and pushing to Git such as to never rebase a pushed branch. We had a discussion around Git best practices on the Mylyn Reviews mailing list a while ago that I have been meaning to capture in the contributors reference: http://dev.eclipse.org/mhonarc/lists/mylyn-reviews-dev/msg00339.html

The main outcome of the discussion was a strong recommendation to run "git pull --rebase" before pushing to keep the history as flat as possible and hence simple to trace. I would recommend that we follow the same practice for all other Mylyn sub-projects as well.

Steffen