Service Portal, Git integration - Best practices
- Mark as New
- Bookmark
- Subscribe
- Mute
- Subscribe to RSS Feed
- Permalink
- Report Inappropriate Content
‎03-08-2017 03:52 PM
Interested in what's the best practices when using version control and having multiple developers, but only one/two instances:
Is working out of a personal development environment frowned upon?
If we can only work out of one instance or two instances, should we use Team Development or standard update sets instead of trying to link with version control?
Main issue is with two instances (not counting personal), only one branch can be used per instance. Curious to hear about anyone else's practices.
- Mark as New
- Bookmark
- Subscribe
- Mute
- Subscribe to RSS Feed
- Permalink
- Report Inappropriate Content
‎03-21-2017 04:52 PM
I think what we'll probably end up doing is having short-lived branches for individual developers - maybe a week or two with regular merges back into the Master once the code is unit tested by the developer. This way I *think* we should be able to catch merge conflicts between stash content as the get merged back into Master, but I'm not 100% sure what will work best.
I think we'd like to avoid long-lived branches - once a release is done the master should be up to date with the branches representing a "point in time" release.