Merge ~checkbox-dev/checkbox/+git/support:ours-merge-stategy-release-snap into ~checkbox-dev/checkbox/+git/support:master
Proposed by
Sylvain Pineau
| Status: | Merged |
|---|---|
| Approved by: | Sylvain Pineau |
| Approved revision: | 2acaf926f01f0fabeebcd6940f37a662bd205bbd |
| Merged at revision: | 442aad2688e104d3c6884611587bea1279d92595 |
| Proposed branch: | ~checkbox-dev/checkbox/+git/support:ours-merge-stategy-release-snap |
| Merge into: | ~checkbox-dev/checkbox/+git/support:master |
| Diff against target: |
13 lines (+1/-1) 1 file modified
release/snap/release_content_snap.py (+1/-1) |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Sylvain Pineau (community) | Approve | ||
|
Review via email:
|
|||
Description of the change
Favor series16 content when doing a rebase on release20 to keep the removal of the p-p-snappy
To post a comment you must log in.
Revision history for this message
| Sylvain Pineau (sylvain-pineau) wrote | # |
There was an error fetching revisions from git servers. Please try again in a few minutes. If the problem persists, contact Launchpad support.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
tested using:
./support/