https://bugs.kde.org/show_bug.cgi?id=425156
--- Comment #6 from Ralf Habacker <ralf.habac...@freenet.de> --- (In reply to Bug Janitor Service from comment #1) > A possibly relevant merge request was started @ > https://invent.kde.org/sdk/umbrello/-/merge_requests/9 The mr shows 6 commits where it should have only one. There seems to be a rebasing problem with release/20.08. If your git remote setup is as described at https://community.kde.org/Infrastructure/GitLab#Submitting_a_merge_request you can clean up your branch by running. git checkout template_typenames_fix This should show the following commits: commit 41a731ee3f8cc93bede427cf6a4ee68611f87cef (HEAD -> template_typenames_fix, bhg/template_typenames_fix) Author: Robert Hairgrove <c...@roberthairgrove.com> Date: Sun Aug 9 14:07:23 2020 +0200 Fix for template typenames as attribute types and operation parameter types commit 839314a652fb70da65e42491a50d1da8e03c3e12 (bhg/release/20.08) Merge: d53a0e78d 47cbb2052 Author: Robert Hairgrove <c...@roberthairgrove.com> Date: Fri Aug 7 10:43:26 2020 +0200 Edited CMakeLists.txt commit d53a0e78d8fc5eb54d9a9c269a92e6c9869b3822 Merge: ea001bcd1 6cb3d4974 Author: Robert Hairgrove <c...@roberthairgrove.com> Date: Fri Aug 7 10:24:41 2020 +0200 Merge branch 'release/20.08' of https://invent.kde.org/sdk/umbrello into release/20.08 commit 6cb3d49749c4e460cf34d777472cf00f5946ce43 (origin/release/20.08, release/20.08) Author: Robert Hairgrove <c...@roberthairgrove.com> Date: Mon Aug 3 22:47:39 2020 +0200 New feature allowing word wrapping in use case texts when resizing and entering line breaks BUG: 424863 FIXED-IN:2.32.01 (KDE releases 20.08.1) Now cleanup your branch with git rebase -i HEAD~3 In the editor, which is then opened, remove all lines except the line containing "Fix for template typenames as" and save Now run git rebase origin/release/20.08 Then git log should show commit 9d426ca2d29289f8d11b3aeef62fba50ed415c40 (HEAD -> template_typenames_fix) Author: Robert Hairgrove <c...@roberthairgrove.com> Date: Sun Aug 9 14:07:23 2020 +0200 Fix for template typenames as attribute types and operation parameter types commit 6cb3d49749c4e460cf34d777472cf00f5946ce43 (origin/release/20.08, release/20.08) Author: Robert Hairgrove <c...@roberthairgrove.com> Date: Mon Aug 3 22:47:39 2020 +0200 New feature allowing word wrapping in use case texts when resizing and entering line breaks BUG: 424863 FIXED-IN:2.32.01 (KDE releases 20.08.1) commit b0705c5cdf305d9ff4da36ea6cb899e465fa3ff3 Author: Christoph Feck <cf...@kde.org> Date: Wed Aug 5 09:24:57 2020 +0200 GIT_SILENT Upgrade release service version to 20.08.0. ... now update the branch used for the merge request by: git push -f fork -- You are receiving this mail because: You are watching all bug changes.
