Table

[tomduggan85]

It looks like these commits are also in the other PR (#26) - it might be best to try and fix the last conflicts in this PR, get this one merged to master, and then in the other branch (#26), merge master into it:

git checkout master
git pull origin master
git checkout flight
git merge master
(fix the conflicts)

Figuring out a git workflow for a project with many people on it is really hard, especially at the beginning of the project when everyone is working on the exact same files and everyone's work depends on everyone else's work. It gets easier as you get further along in the project. Here's what works well for my team:

• Everyone works on their own branch, unless you're pairing or actually working together on a feature
• Create every new branch from master (i.e. be on master when run your git checkout -b (new branch name)
• Whenever you need to bring recent changes from master into your branch, do a merge, not a rebase. i.e. git merge master and fix any conflicts.
• Keep your PRs small and do them more often. Try to avoid having 2 days worth of work, many many files, in your PR.
• If someone else depends on your work, try to get your changes into a PR and onto master (instead of them merging your feature branch into their feature branch.