Quoting Harald Sitter <[email protected]>:
Because I can't read I screwed up some of the application repos
yesterday with a bogus merge of kubuntu_unstable into the
kubuntu_vivid_archive branch.
To avoid insanely mad merge and revert piles I decide to do a partial
history rewrite.
WHEN USING ONE OF THE FOLLOWING REPOS, RUN `git pull --rebase` FIRST
on both kubuntu_vivid_archive and kubuntu_unstable (assuming you have
latter checked out).
<snap>
My god.
The difficulty of using Git. It is a study unto itself and it's vastly
more complicated than anything I have ever witnessed before lol.
Sorry for the inconvenience.
It seems you have been diligently working to clean up the mess. That
must not have been easy.
Coming from some random stranger :p.
--
kubuntu-devel mailing list
[email protected]
Modify settings or unsubscribe at:
https://lists.ubuntu.com/mailman/listinfo/kubuntu-devel
