https://bugs.kde.org/show_bug.cgi?id=444138
--- Comment #4 from Dominik Kummer <ad...@arkades.org> --- Right, but actually I didn't assume that mirroring will provide automatic conflict solving. The strategy is to fork a project, mirror the master branch from upstream on a regular basis, implement new features on feature-branches, merge back to private fork master, and finally file a merge request upstream. The mirroring step just prevents me from missing any conflicting upstream changes. There is also a gitlab article explaining the issue: https://about.gitlab.com/blog/2016/12/01/how-to-keep-your-fork-up-to-date-with-its-origin/ -- You are receiving this mail because: You are watching all bug changes.
