Git Integration

Once your DEVshed is created, your code is cloned from the master branch (initial release) of the repository. A feature branch is then created to track changes, which can be reviewed and squashed into a single commit before merging back to the master branch.

The reason for this is, firstly, to review changes before sharing with other team members working off the master branch.

Secondly, as DEVsheds is making many small commits (for each file create, save or delete operation) and pushing these to the central repository to avoid any loss of work should a workspace container timeout after a period of inactivity (set at 30 minutes for the initial release), working in a feature branch allows the history log to be tidied before merging back to master and sharing with teammates.

The feature branch name has the prefix europa-.

Clicking on the “Branches” link in the Bitbucket sidebar menu takes you to the page where you can create a Pull Request from the DEVsheds feature branch.

Open

Alternatively, from the DEVsheds Launchpad, you can click on the “Merge & close” button in the top nav bar to open a dialog. Here you can enter a commit message. On submit, the feature branch will be squashed into a single commit and merged back into the master branch. Your DEVshed will also be shut down.

Open