Updating from CKSource

Repository Owner: Be sure branches 3.6.x & 4.0.x, etc. stay updated in Upstream.

Note: svn/3.6.x will only exist as a remote on your local machine.

• From CKEditor's SVN repository (3.6.x only)

$ git svn fetch              # Collect SVN metadata and create Git commits as necessary.
$ git checkout 3.6.x
$ git merge svn/3.6.x
$ git push upstream 3.6.x # Repo. Owner only.
$ git co ee-3.6.x
$ git merge 3.6.x

• From CKEditor's Github repository (4.x only)

$ git fetch ckeditor [tag/branch]
$ git checkout 4.5.x
$ git merge ckeditor/release/4.5.x
$ git push --tags upstream 4.5.x # Repo. Owner only.
$ git co ee-4.5.x
$ git merge 4.5.x # or tag

• Git tags from SVN tags

Git tags that reference SVN tags are not useful, or needed, and may cause confusion. Do not convert SVN tags into Git tags.

git-svn does not do this automatically. git-svn makes an assumption that SVN tags may have been modified since being created, so it treats them as SVN branches, prefixed with /tags/.