Page MenuHomePhabricator

deployment-puppetmaster04: git-sync-upstream is failing with a merge conflict since 2020-07-17T08:50:01Z
Closed, ResolvedPublic


The git-sync-upstream script is failing on deployment-puppetmaster04 due to a merge conflict with a local commit, and consequently the Beta Cluster hasn't received any Puppet changes made since then.

The conflict appears to be between this commit and local commit d94fd12 ("prometheus: make ferm DNS record type configurable").

Event Timeline

Mholloway updated the task description. (Show Details)

@Krinkle I have manuly resolved the conflicts and things look good to me, is someone able to confirm that things are working as expected now?

Mholloway claimed this task.

Yes, this is working well again, thank you @jbond.

Great thanks, resolving