Updating an import on a release branch breaks future master updates
The basehash
calculation finds the release import and triggers conflicts when merging into master
's copy of the import. Not sure how best to fix this.
Cc: @brad.king
System updates will be applied on Nov 25th between 7am and 9am, EST (UTC-05:00). This site will have intermittent downtime during that time.
The basehash
calculation finds the release import and triggers conflicts when merging into master
's copy of the import. Not sure how best to fix this.
Cc: @brad.king