Difference between revisions of "Updating the Git master branch"
Jump to navigation
Jump to search
| Line 2: | Line 2: | ||
This task should be conducted by the Center Chair after a vote has approved the proposed changes. | This task should be conducted by the Center Chair after a vote has approved the proposed changes. | ||
__TOC__ | |||
== Close the issue == | == Close the issue == | ||
Revision as of 17:30, 6 March 2017
This page describes how to update the Git master branch with the changes in an alternative branch.
This task should be conducted by the Center Chair after a vote has approved the proposed changes.
Close the issue
- Go to Redmine https://redmine.blackboxframework.org/projects/blackbox/issues.
- Alternatively:
- Go to the Center page: https://forum.blackboxframework.org.
- Click on the top level yellow option "Redmine mirror"
- Click on the "Issues" tab.
- Click on the issue. You can use either the number "#" or the "Subject" in the list of issues.
- You now need to be logged in.
- Select the "Edit" option (upper right hand corner).
- Change the "Status" to "Closed".
- "Submit" to apply the change; this button is in the bottom-left corner.
- Exit redmine.
Merge the Branch
- Go to GitHub https://github.com/BlackBoxCenter/blackbox.
- Alternatively:
- Go to the Center page: https://forum.blackboxframework.org.
- Click on the top level yellow option "Github repository"
- Click on the large blue "blackbox" text in the center of the page.
- Use the drop-down on the left of the page "Branch: master ▼" to select the required branch. The branch is identified by its issue number.
- Press "New pull request" button just to the right of the previous drop-down.
- Click the large green "Create pull request" button.
- Click the large green "Merge pull request" button. This assumes there were no "conflicts with the base branch".
- Click the large green "Confirm merge" button.
- You should now have a box that says "Pull request successfully merged and closed". In this box click the "Delete branch" button.
Check the new build
This should be the end of the task.
You can confirm the master has been updated successfully by going to: http://blackboxframework.org/unstable/master/.
I find this as below; there may be a more direct route:
- Go to the Center page: https://forum.blackboxframework.org.
- Click on the top level yellow option "Main page"
- Click on "Goto Download page" (bottom of top-left region).
- Click on "A repository of all Center development versions is available".
- Click on the "master/" directory.
Check the date / time of the latest master. It may take a few minutes before the new master is available.