[AEON] HOW-TO download/install/update/test Aeon from its Git repository

Ok, so got this all working, but I edit my own files, to say includes the international ratings mod. When i go to pull for an update i get

error: Entry '720p/DialogVideoInfo.xml' not uptodate. Cannot Merge.

Which setting do I have to change to allow it to merge. Or even so it will overwrite it if there has been a change and I can modify the file again?

Kudos for this.

AWESOME. I've never used anything but SVN and apparently I fail at GIT by myself. I really appreciate this!

Quote:The guide is finished for the most part. I'm not sure about the Git GUI part as I have never used it. Hopefully someone else can shed some light on it. I hope this helps. Please post any questions or feedback.

Also since although I'm a zsh user, I decided for funsies on windows to use the GUI, your tutorial worked great!


--FF

OK, looking through this, if i do a git checkout -m, then a git pull, would this solve the problem?
I did it, it gave a list of the files i had changed, but then there hasn't been an auriga update, so i didn't see it pull any files either.

It's nice to see a guide on the Git GUI version as well.

Great job with the guide!! You know you've done good when you get a nod from,.....well,..you know who

Quote:Kudos for this.

lol..seriously, it would be good if the guide was made sticky or put somewhere else, just so all the hard work doesn't get lost 20 pages deeps by next week. Aeons threads move pretty fast!

kulprit Wrote:Ok, so got this all working, but I edit my own files, to say includes the international ratings mod. When i go to pull for an update i get

error: Entry '720p/DialogVideoInfo.xml' not uptodate. Cannot Merge.

Which setting do I have to change to allow it to merge. Or even so it will overwrite it if there has been a change and I can modify the file again?

This would be a "manual merge" situation, and I don't have enough experience with git to know the best procedure. (Sorry, I come from the land of Rational ClearCase.) The only thing I can think of would be to add that file to the .gitignore file so that git won't try to update it. Of course, you won't get further updates after that.

The problem is that git is trying to merge in the changes that djh has made, but it is trying to apply the delta (change) to a particular state of the file. If that state has changed, then git isn't smart enough to know if the delta will conflict with your change or not.

Have an idea for a work around for people who edit stuff.

If you do a git stash save, this will reload the last download you did, then update with a pull.
Finally do a git stash apply, and your changes should come back, going to try it now.

All worked great on the xml files i had changed, although it didn't like the change on one of the movielines.png. So resolved this and tried again, all worked great.
I have also started using tortoise git, along with git bash, so i can see in my file system how things are going.

I have everything setup. Followed the directions to the tee but once I do git checkout -b auriga origin/auriga the following comes up:

xbmc@xbmc:~/.xbmc/skin/Aeon Auriga$ git checkout -b auriga origin/auriga
warning: refname 'origin/auriga' is ambiguous.
warning: refname 'origin/auriga' is ambiguous.
fatal: Ambiguous object name: 'origin/auriga'.

Have been getting a corrupted error for days now, any ideas?

Just running standard