![]() ![]() To check if there were previously local changes on master:.Clean up any conflicts when the merge is done.Git merge -squash -no-commit release-5.0.3 Merge a new release of Bugzilla using an upstream tag.The instructions below assume that Bugzilla was previously merged to release-4.2.11 and is being updated to release-5.0.3. Pull updates from the upstream repository.git/info/grafts file to provide artificial merge points between the two remote repositories. Change directories into the git working directory.įIXME: Should be able to make this faster by pre-caching remotes/origin/trunk and Set up tracking branch for upstream.Git clone git:///bugzilla.git bugzilla.git In theory, this should be faster than the Setup from Scratch section. Pull the repo from a central git server and set it up to do a merge. Git remote add origin git:///bugzilla.git Add new origin remote and push the repository.Git branch -track upstream remotes/upstream/master Create a local git branch to track the upstream/master branch.Import the upstream Bugzilla git repository.Import Websites/ from the WebKit repository into a local git-svn repository.If you have a modern Xcode on macOS, these are already installed. Subscribe to the mailing list to receive email for security updates and new releases.If you already have a git-svn repo for Websites/, you can skip to the Setup from git-svn Repository section. This section describes how to set up a merge environment from scratch. This page describes a process to update the Bugzilla instance running on . ![]()
0 Comments
Leave a Reply. |
AuthorWrite something about yourself. No need to be fancy, just an overview. ArchivesCategories |