[webkit-dev] WebCore has moved: How to avoid merge conflicts

[Adam Barth]

As of r75314, WebCore is now located in Source/WebCore.
If you have outstanding patches to WebCore, here's what you can
do to avoid merge conflicts:

1) *BEFORE* updating past r75314, create a patch for your change,
either with svn-create-patch or by uploading your patch to
bugs.webkit.org with webkit-patch.

2) Clean your working copy.  I recommend using "webkit-patch clean",
but you can also use svn-unapply, "svn revert", "git reset", or
whatever you're most confortable with.

3) Update to top-of-tree.

4) Apply your patch using svn-apply or "webkit-patch
apply-attachment".  As of r75315, svn-apply is smart enough to
magically apply the WebCore parts of your patch to
Source/WebCore.

Please let me know if you have any merge trouble.  Hopefully we've got
things set up so that the move is relatively painless.  Thanks again
for your patience.

Adam