GitMajorWorkflow

Introduction

Put the workflow for major development here.

Workflow

> git checkout -b <meaningfulBranchName>

where <meaningfulBranchName> is a name that encapsulates the set of software changes you'll be making, such as GeomForMARS2018a, etc.

Do your work. Edit/create/move files, etc. git add files to track them, commit them when ready.

Assuming this is a "long-term" development project, you'll want to occasionally bring in the most up-to-date master and make sure there are no conflicts. I'd like to see git experts weigh in on the best way to do this. Merge, rebase, other?

Also, I think we need to nail down our request to pull mechanism and get that into the cheat sheet.