upgrade-charm fails to git merge binary .pyc files
Bug #1281528 reported by
Michael Nelson
This bug report is a duplicate of:
Bug #1191028: .pyc files caused update-charm to fail with merge conflicts.
Edit
Remove
This bug affects 2 people
| Affects | Status | Importance | Assigned to | Milestone | |
|---|---|---|---|---|---|
| juju-core |
New
|
Undecided
|
Unassigned | ||
Bug Description
Not sure how reliable these steps are but:
1) deploy your charm with charm-helpers
2) switch to another branch of your charm which has a newer charm-helpers
3) run upgrade-charm
Expected result: charm upgrades as normal
Actual result, internal juju merge conflicts when updating the charm [1]
Doing `resolved --retry` seems to fix everything, so its easy to work around.
To post a comment you must log in.
