As I have been, on Linux and Mac, I have a partial solution to the problem of checking out the juce tip. It appears the GIT community decided that a merge strategy of ‘theirs’ (there is an ours strategy) was silly, and it was removed. They have decided that we should all become better programmers and ever deciding that our work is inferior to that of Jules means we are weak etc. Sort of a Sparta programming ethos. Delightful.
So that means we can’t do what we’d like, which is:
git merge -s “take new version over mine if conflicted”
This only crops up if you’ve made any local changes at all. Like building the project, or something radical like that.
Anyway, if a straightforward merge fails, I think the best approach is to check all your changes (and untracked files, whatever) into a new branch, then fetch the origin and then try to merge the bits you care about. I wouldn’t be surprised if that runs you into trouble down the line though.
The nuclear option - and don’t blame me if you lose code doing this, is:
git fetch origin
git reset --hard origin
I did a pretty good mess around with checkout, pull, fetch etc., and the problem is I end up with merge errors all over. Obviously, trying to manually merge juce_amalgamated.h/cpp would be ‘a bad thing’. If someone does have a better strategy, please pipe up.
Hope that helps someone,