title: GIT Workflow for a cloned GitHub Repo
body: <p>I have a workflow question but it's not really based on anyone's opinion, but more on the exact abilities of GIT in terms of keeping projects up to date with a master repo.</p>
  
  <p>I'm building a version of <a href="https://github.com/backbone-boilerplate/backbone-boilerplate" rel="nofollow">Backbone-Boilerplate</a> that will use <a href="https://github.com/twbs/ratchet" rel="nofollow">Ratchet</a> for building PhoneGap apps.</p>
  
  <p>I've set up my own GitLab installation for storing our company code and added the clone there as a master branch.</p>
  
  <p>So my question is, what is the best way to go about this in order to keep everything up to date with the origin master?</p>
  
  <p>I want to keep the master BBB repo up to date with the origin, but should I do a fork of this repo to build the Ratchet version, or should I create a "ratchet" branch (and any other versions ie: bootstrap, etc.) and then merge or rebase the master into the branches as changes are committed?</p>
  
  <p>If I create a fork, is it possible to merge upstream changes into a fork? I've never actually worked with forks before and I'm unclear at this point which method I should use.</p>
  
  <p>So to be clear, the ultimate goal is to be able to update any version we create to match the master BBB repo on GitHub, minus the additional files we create.</p>
  
  <p>Thanks.</p>