mongoid icon indicating copy to clipboard operation
mongoid copied to clipboard

Merge changes from 9.0-stable into master (please don't squash commits)

Open johnnyshields opened this issue 7 months ago • 2 comments

Please merge without squashing commits, so that we can track the two branches are sync'ed-up.

johnnyshields avatar May 05 '25 20:05 johnnyshields

@johnnyshields the Ruby team generally doesn't merge up their branches, but cherry-picks to older branches. Can you elaborate on what the reason is for merging 9.0 into master?

alcaeus avatar Jun 23 '25 13:06 alcaeus

Merging changes done on x.y-stable branches back into master would be an excellent practice for the MongoDB Ruby team to adopt. Not only does it act as a check-sum to ensure the team hasn't missed any critical commits/fixes done on those branches--this has happened in the past for Mongoid!--it also makes it much easier for external users like myself to understand what has changed when upgrading.

Git was made to make branch management easy. Let's use it! 💪

johnnyshields avatar Sep 08 '25 21:09 johnnyshields