You just need to pull -r from upstream on a very regular basis. We're not large, and we're 'colocated' (management speak for 'sit together') so that might be a factor.Ī caveat: I am definitely not an expert at any of this.Īny project I've ever worked on where multiple people are commiting to the same generic "development" branch results in lots of merge conflicts unless people are super careful to always pull the latest changes and merge master often. There are other ways, but it's all essentially 'trunk based development' and is definitely opposed to 'git workflows' á la Gitflow. The idea here is that we're always pushing to master and deploying to live, leaning on our tests to ensure integration. So my team practices continuous delivery / continuous deployment.
0 Comments
Leave a Reply. |
AuthorWrite something about yourself. No need to be fancy, just an overview. ArchivesCategories |