Branching and Merging Strategies
I have been tasked with coming up with a strategy for branching, merging and releasing over the next 6 months.
The complication comes from the fact the we will be running multiple projects all with different code changes and different release dates but approximately the same development start dates.
At present we are using VSS for code management, but are aware that it will probably cause some issues and will be migrating to TFS before new development starts.
What strategies should I be employing and what things should I be considering before setting a plan down?
Sorry if this is vague, feel free to ask questions and I will update with more information if required.
This is the single best source control pattern that I have come across. It emphasizes the importance of leaving the trunk free of any junk (no junk in the trunk). Development should be done in development branches, and regular merges (after the code has been tested) should be made back into the trunk (Pic 1), but the model also allows for source to be patched while still under development (Pic 2). I definitely recommend reading the post in its entirety, to completely understand.
Pic 1
Pic 2
Edit: The pictures are definitely confusing without words. I could explain, but I would basically be copying the original author. Having said that, I probably should have selected a better picture to describe the merge process, so hopefully this helps. I'd still recommend reading the post, however:
- Storing revision changes of a message
- How can I rename a local Git branch?
- RPC failed; HTTP 400 curl 22 The requested URL returned error: 400 Bad Request
- GitHub: How to do case sensitive search for the code in repository?
- Do I commit the package-lock.json file created by npm 5?
- How best to compile gnu.mail.providers
- Set up git to pull and push all branches
- Multiple GitHub accounts on the same computer?
- Is there an open source equivalent to piper, Google's version control tool?
- How can I undo git reset --hard HEAD~1?
- How to set the default branch in GitHub.com?
- How do you fork your own repository on GitHub?
- flutter upgrade is not working in vs code giving improper url as well?
- Git bash for Windows NOT prompting for password
- git reset asks 'more?'
- Merge Unity 3D scene with Git
- Visual Studio Solution from multiple Git repositories
- VSCode: What is the best way to commit a list of extensions to be used by VSCode in a project?
- Pull and push multiple branches efficiently
- How do I undo the most recent local commits in Git?
- How do I make a Git commit in the past?
- How can I install extras from a git subdirectory with pip?
- Security config error while upgrading version of spring boot application from 2.x.x to 3.3.0
- How to roll back to a previous commit without losing further ones?
- How do I create a readable diff of two spreadsheets using git diff?
- Re-establish TFS source control bindings
- How to remove all traces of an old GitHub repo in Visual Studio Code? ("A Git repository was found that was previously closed)
- How can I revert multiple Git commits (already pushed) to a published repository?
- Configure git to automatically track _specific_ (different) remote branch when creating branch locally
- Download single files from GitHub