I am following the instructions to upgrade the Mender server, in particular the part about using the git commands to integrate the changes from mainline (i.e.
2.5.0) into our branch (with mods to
The doc says to use
git merge to merge
2.5.0 into our branch. However, when I do that I get many merge conflicts in the following files:
Unmerged paths: (use "git add <file>..." to mark resolution) both modified: ../docker-compose.client.rofs.yml both modified: ../docker-compose.client.yml both modified: ../docker-compose.docker-client.yml both modified: ../docker-compose.enterprise.yml both modified: ../docker-compose.yml both modified: ../extra/changelog-generator/changelog-generator both modified: ../extra/changelog-generator/test-changelog-generator both modified: ../extra/gitdm/company-map both modified: ../extra/gitdm/mailmap both modified: ../git-versions-enterprise.yml both modified: ../git-versions.yml both modified: ../other-components.yml
Conflicts are pretty easy to fix as they are related to the various version upgrades, for instance:
# This file lists software components that are part of a Mender Enterprise release # which are published with the global Mender product version. The versions here # therefore point to the internal Git tags/branches. We keep this information as a # docker-compose YAML file for parsing purposes. services: # # backend enterprise services # mender-deployments: <<<<<<< HEAD image: registry.mender.io/mendersoftware/deployments-enterprise:2.0.0 mender-inventory: image: registry.mender.io/mendersoftware/inventory-enterprise:2.0.0 mender-workflows-server: image: registry.mender.io/mendersoftware/workflows-enterprise:1.1.0 mender-workflows-worker: image: registry.mender.io/mendersoftware/workflows-enterprise-worker:1.1.0 mender-tenantadm: image: registry.mender.io/mendersoftware/tenantadm:2.0.0 mender-useradm: image: registry.mender.io/mendersoftware/useradm-enterprise:1.11.0 ======= image: registry.mender.io/mendersoftware/deployments-enterprise:2.1.0 mender-inventory: image: registry.mender.io/mendersoftware/inventory-enterprise:2.1.0 mender-workflows-server: image: registry.mender.io/mendersoftware/workflows-enterprise:1.2.0 mender-workflows-worker: image: registry.mender.io/mendersoftware/workflows-enterprise-worker:1.2.0 mender-tenantadm: image: registry.mender.io/mendersoftware/tenantadm:2.1.0 mender-useradm: image: registry.mender.io/mendersoftware/useradm-enterprise:1.12.0 mtls-ambassador: image: registry.mender.io/mendersoftware/mtls-ambassador:1.0.0 >>>>>>> 2.5.0
I can undertstand why the conflict exists (changes from both sides on the same line) but I was not expecting them.
Is that expected or did I make a mistake here?
Thanks for the feedback!