ENH Prevent merge-up from linkfield v3 #32
Conversation
emteknetnz
force-pushed
the
pulls/1.0/linkfield
branch
from
3aec95f to
0559e71
Compare
| // List of major branches to not merge up from | ||
| // Add repos in here where the repo was previously unsupported | ||
| // Note these are actual major branches, not CMS major versions |
There was a problem hiding this comment.
This should technically use a PHPdoc comment (i.e. /** the comment */) but since this is only an internal tool and this is the only change I'd request, I'll just leave it as is.
| [ | ||
| {"name": "1"}, | ||
| {"name": "2"}, | ||
| {"name": "3"}, |
There was a problem hiding this comment.
Add a 3.0 branch as well, to ensure this also doesn't try to merge up 3.0 into 3 - ultimately the point of this is to pretend that there is nothing before 4.0 for merge-ups.
Actually that doesn't really matter so I won't ask for it. Just leaving the comment so people in the future know it was considered.
Ultimately whether 3.0 would be merged up to 3 doesn't affect anything. If someone's separately maintaining that it may even be useful to them, but the important part is we don't get anything from 3.x into 4.x.
Issue silverstripe/silverstripe-linkfield#227