The aim of this guide is to give a clear description of how we should be utilizing git for version control and how best to sync up development between EEMS and EE for releases.
Receiving Notifications from Bitbucket
Bitbucket provides a convenient way to get updates on a repo. I suggest you subscribe to the repo so you will get email updates when changes are made. To do this go to:
https://bitbucket.org/dsintl/efdc/src/master/
and select click the button highlighted in the top right and select “Manage notifications”
...
Select at least the following:
...
This will keep you up to date on what others are doing to the repository.
Versioning and Synchronization with EE Development
...
I propose the branches should have the following structure:
master - contains code that is ready to be released in conjunction with EE. To differentiate between versions we will use the “git tags” feature
develop - this will contain the most up to date features and changes to the code but might not be ready for a release into the master
feature branches - basically all other branches will be feature branches of some sort.
bug fixes - if you want to fix a specific bug I think it would be great to make a bug fix that aligns with a Jira bug report. I think this is a goal for us to get to
...
.
Workflow Overview Using the Command Line
Guided Workflow Using Visual Studio
This section will provide a step by step instruction set for using git with Visual Studio’s build in extension.
Open the Team Explorer window in Visual Studio
...