With svn up you are just as likely to see a conflict. ________________________________ From: [email protected] [[email protected]] on behalf of Ryosuke Niwa [[email protected]] Sent: Thursday, March 08, 2012 3:12 PM To: Adam Treat Cc: Ashod Nakashian; WebKit Development Subject: Re: [webkit-dev] Moving to Git?
On Thu, Mar 8, 2012 at 12:04 PM, Adam Treat <[email protected]<mailto:[email protected]>> wrote: 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. On Thu, Mar 8, 2012 at 12:05 PM, Joe Mason <[email protected]<mailto:[email protected]>> wrote: It seems to me that there's no need to use multiple local branches in git if you find it confusing - it's an additional feature, but I don't see anything that requires it. What workflow do you have that requires you to have multiple branches locally in git, and how do you solve it in svn without using branches? What precisely do you find difficult about merging remote changes, and how is the svn equivalent easier? The simplicity. In git, I have to worry about things like committing local changes before rebasing to master, or stashing, etc... In svn, all I have to do is to run "svn up". - 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. _______________________________________________ webkit-dev mailing list [email protected] http://lists.webkit.org/mailman/listinfo.cgi/webkit-dev
