This repository has been archived by the owner on Nov 2, 2020. It is now read-only.
Update PUP3 with rel-eng changes #8
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
daviddavis
reviewed
Feb 20, 2018
pup-0003.md
Outdated
| 3. The person cherry-picking would also need to track in Redmine which dev | ||
| branch(es) the change has been applied to. | ||
| first merge the commit to master. Then, this person updates the platform | ||
| relesae field on the issue. Automated tooling will, at release time, |
daviddavis
reviewed
Feb 20, 2018
pup-0003.md
Outdated
| attempt to cherry-pick from master to the latest x.y-release branch | ||
| opening a PR with all the changes for a release. | ||
| 3. The person fixing the issue would also need to track in Redmine which | ||
| release the change is tied to. |
There was a problem hiding this comment.
Is this the same as the previous step (ie "updating the platform release field on the issue")?
There was a problem hiding this comment.
Sure is, i was updating tranactionally it seems
daviddavis
reviewed
Feb 20, 2018
pup-0003.md
Outdated
| 4. The person cherry-picking would also need to track in Redmine which release | ||
| branches the change has been made to. | ||
|
|
||
| ### Conflicts | ||
|
|
||
| If the cherry-pick has conflicts, we should abandon the cherry-pick and | ||
| encourage users to upgrade to the next Y release. | ||
| If the cherry-pick has conflicts, we should asses why the conflicts arose (missed |
pcreech
force-pushed
the
PUP3-updates
branch
from
2bbb780
to
3bd8c0f
Compare
ammaritiz
reviewed
Feb 21, 2018
| @@ -47,7 +47,7 @@ newer ones) still need to be merged forward. We could elminate the need for | |||
| this with cherry-picking. It's worth noting though that this rarely happens. | |||
There was a problem hiding this comment.
@ammaritiz edited, nice catch!
pcreech
force-pushed
the
PUP3-updates
branch
from
3bd8c0f
to
aa4ac8f
Compare
|
LGTM. Once this gets a second approval, will merge. |
dralley
approved these changes
Feb 27, 2018
daviddavis
approved these changes
Feb 28, 2018
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.