remote branch rebase challenge - with Mercurial
Showing the power of git - with Mercurials ease of use. This takes the rebasing challenge by felipec. All the code is available in https://bitbucket.org/ArneBab/hg-test-namespaced-bookmarks Notice: This has a far more complex repository structure than the test by FelipeC, because he could not provide his repos. So there are far more conflicts to resolve (on average there are 3-5 conflicting files per rebase, as opposed to 0-1 for FelipeC). The two dragon-images in the background were created by Trudy Wenzel¹ for http://1w6.org The red moon is from the KDE background images. ¹: Trudy Wenzel is a graphical artist and great hobby singer. You can find more of her graphical works on http://blackthumbstudios.artworkfolio.com/ License: GPLv3+
Showing the power of git - with Mercurials ease of use. This takes the rebasing challenge by felipec. All the code is available in https://bitbucket.org/ArneBab/hg-test-namespaced-bookmarks Notice: This has a far more complex repository structure than the test by FelipeC, because he could not provide his repos. So there are far more conflicts to resolve (on average there are 3-5 conflicting files per rebase, as opposed to 0-1 for FelipeC). The two dragon-images in the background were created by Trudy Wenzel¹ for http://1w6.org The red moon is from the KDE background images. ¹: Trudy Wenzel is a graphical artist and great hobby singer. You can find more of her graphical works on http://blackthumbstudios.artworkfolio.com/ License: GPLv3+