Repository in Dropbox

[Anneke]

I am running Matlab code in a directory which is shared with other persons on my team through Dropbox.

We want to both develop this code, merging changes with the original code on a regular basis.

How would you recommend to set this up?

Should I turn the original folder on Dropbox into the "Master" repository on BitBucket?

And then create a branch, clone this to a local folder anywhere on my pc and tell Matlab to use code in this folder? Once we decide that changes are good and wish to merge the branch, would that then update code in the master (Dropbox) folder?

I am obviously completely new to Git, learning the jargon, but still having some trouble getting my head around it. Any help will be appreciated!

[Daniel Santos]

Hi @Anneke

It will depend on your process. I think you could have good isolation for a stable development collaboration using two main branches: develop and master.

master - This branch will hold everything that is tested and approved for your team. It is where the stable code is located. Usually, you only have here what was released.

develop - This branch will hold everything that is working, but was not yet considered done to be released.

When working with git you will always have a local copy of the repository. When you commit in git you commit in your local repository. You have the version control supporting you, even when the changes were still not sent to the remote repo. Usually, we only push the changes (send updates to the remote repository) when we consider them good enough to be shared with the team.

I think this document will help you to plan how is the best way to set your process using git:

• Gitflow Workflow | Atlassian Git Tutorial

The same document has different sections about git that will allow you to understand how it works in details.

I hope that helps you to move forward.