On 5/31/2018 3:00 AM, Mark Thomas wrote:
Hi,
The next issue to resolve for the Git migration is developer process.
Note that this does not cover branch names, merge strategy etc. This is
issue is about the options available for developers to organise their
local development environment. The key question is how to efficiently
switch between trunk, 8.5.x and 7.0.x.
To some extent this will be personal preference. However, it would be
useful to have some recommendations to give folks a starting point.
Options discussed previously include:
- multiple clones
- git worktree
According to this blog post [1] Git Worktrees are a better solution. It
looks like Worktrees were added in order to address the shortfalls of
maintaining multiple clones.
There is a warning, however, about using Worktrees on repos that contain
submodules [2], and I don't know if that applies to the Tomcat repos or
not, so that's something to look out for.
Igal
[1]
https://spin.atomicobject.com/2016/06/26/parallelize-development-git-worktrees/
[2]
https://blog.github.com/2015-07-29-git-2-5-including-multiple-worktrees-and-triangular-workflows/
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
