From our process of creating a release-v# branch, merging in SharedDevelopment, and then after validating the release merging that into master, we get two commits in master that aren't in SharedDevelopment. What do we do about these? They have no changed files in them relative to SharedDevelopment. We could update SharedDevelopment from master, but would these commits then get re-committed into master at the time of the next release? Is there any downside to this? A lab member should research this and report back to the lab.
From our process of creating a
release-v#branch, merging inSharedDevelopment, and then after validating the release merging that intomaster, we get two commits inmasterthat aren't inSharedDevelopment. What do we do about these? They have no changed files in them relative toSharedDevelopment. We could updateSharedDevelopmentfrommaster, but would these commits then get re-committed intomasterat the time of the next release? Is there any downside to this? A lab member should research this and report back to the lab.