-
Find an example commit from your Rush Hour project which was dealing exclusively with a Git problem rather than a feature or bugfix (e.g. "Fix merge commit", "Really add file...", "Merge master multiple times in a row", etc)
- Sometimes we had to commit changes again because the person who commited wasn't on the correct branch or didn't have the right changes on their branch.
-
What do you believe the root cause of some of these issues were?
- Possibly not looking at the branch before commiting.
-
How did they impact your ability to work on the project?
- We were a bit unsure if we had the actual changes we wanted when we merged to master and pulled onto everyone's machine.
- Sometimes to merge changes from multiple people we just sent changes over slack so that only one person was changing a file at a time.
-
What solutions worked for you and your team?
- Using a terminal that always tell you what branch you are currently on is helpful for me.
Last active
June 3, 2016 16:45
-
-
Save robbiejaeger/a82660dca28042dd7ca1eff7d59f648a to your computer and use it in GitHub Desktop.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment