We found we could have avoided most of these by keeping the branches short and merging with the remote master before pushing. And these are quickly resolved on the build server by cleaning the workspace. Since nobody is working on the 'merging' machine and nobody other than the CI server touches the master, we have very infrequently merging issues (in about 1-2% of the commits). every couple of days) merge our working branches with the central master to keep them 'close'. The central server is monitored by a hudson CI server which pulls the changes, merges all updated branches, rebuilds the software, runs the tests and pushes everything to the central master git repository.įrom there we pull it back to our repositories. When ready to share this is pushed to the central server. Each dev creates a branch per ticket and works on this branch. We cut our work in Jira tickets which do not take too long, typically 1-2 days effort. My way of doing this currently is listed below: git checkout masterįor our team we set something up which works very well and does not use rebase at all.
0 Comments
Leave a Reply. |
AuthorWrite something about yourself. No need to be fancy, just an overview. ArchivesCategories |