canvas-lms icon indicating copy to clipboard operation
canvas-lms copied to clipboard

Request: tag treesame commits

Open christopher-b opened this issue 5 years ago • 2 comments

Summary:

Please tag treesame commits.

Us self-hosted folks rely on treesame commits to merge updates. Merging specific tags results in many merge conflicts for files we have not touched. Merging treesame commits does not generate these conflicts, but it requires a bit more work to find the correct commit to merge. Tags for treesame commits would make this part of the process a bit easier, and it would make automating updates easier.

Thanks!

christopher-b avatar Aug 06 '19 19:08 christopher-b

This gets a hearty +1 from us at SFU. We also rely on merging treesame commits and have had the same issues with spurious conflicts when attempting to merge release tags. We currently merge the individual treesame commits and find them by using git log instructure/stable --grep treesame but having tags would make this much easier to automate, which given the move from three to two week deploys is something we're looking into doing more of.

grahamb avatar Aug 06 '19 19:08 grahamb

Thanks for contributing to this issue. As it has been 2 years since the last activity, we are automatically closing the issue in 30 days. This is often because the request was already solved in some way and it just wasn't updated or it's no longer applicable. If that's not the case, please respond before the issue is closed, or post a message on the mailing list. We'll gladly take a look again!

stale[bot] avatar Jan 09 '22 07:01 stale[bot]