Hi,
we try to avoid merging to keep the history readable (as linear as
possible). Bugfixes to KDE/* branches are cherry-picked to other
branches as needed, just as we cherry-pick bugfixes from master to KDE/*
branches for backporting. Therefore I see no need for a merge. The
conflicts make sense:
- changes to the windows NSIS installer (wouldn't expect a conflict
here, but I'll forward-port that as needed when doing the 1.9 Windows
installer)
- version numbers in the branches are both bumped after the branch
point, hence conflict (src/apps/marble-ui/ControlView.cpp,
src/lib/marble/CMakeLists.txt, src/lib/marble/MarbleGlobal.h)
- the code of PopupLayer was refactored, so a bugfix that came
afterwards needed adjustment when it was backported. That cannot be
merged back to newer code.
Regards,
Dennis
Am 17.07.2014 20:39, schrieb Albert Astals Cid:
El Dijous, 17 de juliol de 2014, a les 07:20:34, Torsten Rahn va
escriure:
What kinds of conflicts? :-)
Attached.
Cheers,
Albert
-----Original-Nachricht-----
Betreff: Does 4.14 contain all the code it should?
Datum: Thu, 17 Jul 2014 00:56:28 +0200
Von: Albert Astals Cid <[email protected]>
An: marble-devel <[email protected]>, Dennis Nienhüser
<[email protected]>, Torsten Rahn <[email protected]>
Hi guys, i tried merging 4.13 into 4.14 to make sure that all the code
that
was in 4.13 is in 4.14 but i got a huge conflict (i guess you don't
like
merging (you should makes things like this very easy)) so i can't be
sure
4.14 contains everything that was in 4.13 too.
Can anyone confirm that 4.14 indeed contains everything it should?
Cheers,
Albert
_______________________________________________
Marble-devel mailing list
[email protected]
https://mail.kde.org/mailman/listinfo/marble-devel
