[webkit-dev] Moving to Git?

[Adam Treat]

There is nothing about git that forces you to have multiple branches locally.  Good practice, yes, but nothing forcing it.  As for the difficulty of resolving conflicts between patches you've made locally and changes made on the shared repository since you started making your local patches... nothing about git makes this any harder.  Unless you have a lock based source control system you'll have to resolve conflicts.
________________________________
From: webkit-dev-bounces at lists.webkit.org [webkit-dev-bounces at lists.webkit.org] on behalf of Ryosuke Niwa [rniwa at webkit.org]
Sent: Thursday, March 08, 2012 3:00 PM
To: Ashod Nakashian
Cc: WebKit Development
Subject: Re: [webkit-dev] Moving to Git?

On Thu, Mar 8, 2012 at 11:24 AM, Ashod Nakashian <ashodnakashian at yahoo.com<mailto:ashodnakashian at yahoo.com>> wrote:
>And that's a show stopper for me. For build bot maintenance, regression fixes, etc... being able to easily tell the number of commits between two revisions (in my head as opposed to using a tool) or the ordering of commits is crucial.

I think this is an interesting point. It seems there are two solutions. We can enforce fast-forward as many have pointed out and we can maintain an SVN mirror. Although I don't like the idea of maintaining an SVN repo, and it's almost universally agreed that git offers superior tools to SVN.

I don't think so. I like the simplicity of svn. While git client works great, I always get frustrated by the complexity of having multiple branches locally and the amount of work required to merge the remote changes on the branch I'm working on.

- Ryosuke


---------------------------------------------------------------------
This transmission (including any attachments) may contain confidential information, privileged material (including material protected by the solicitor-client or other applicable privileges), or constitute non-public information. Any use of this information by anyone other than the intended recipient is prohibited. If you have received this transmission in error, please immediately reply to the sender and delete this information from your system. Use, dissemination, distribution, or reproduction of this transmission by unintended recipients is not authorized and may be unlawful.