Posts: 252
Joined: Jan 2009
Reputation:
1
2009-05-01, 08:49
(This post was last modified: 2009-05-01, 08:56 by kulprit.)
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.
Posts: 243
Joined: Mar 2009
Reputation:
0
Ritzie
Senior Member
Posts: 243
2009-05-05, 14:04
(This post was last modified: 2009-05-05, 14:07 by Ritzie.)
I have everything setup. Followed the directions to the tee but once I do git checkout -b auriga origin/auriga the following comes up:
[email]xbmc@xbmc:~/.xbmc[/email]/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'.
Posts: 20
Joined: Aug 2008
Reputation:
0
Cleared everything back down, removed the directories, check my hdd for errors and re-ran the process, all working fine now, odd, but glad its working thanks for the advice
Posts: 243
Joined: Mar 2009
Reputation:
0
Ritzie
Senior Member
Posts: 243
2009-05-06, 02:29
(This post was last modified: 2009-05-06, 02:56 by Ritzie.)
I followed what was in the terminal like you said and it worked perfectly. Thanks!!! The first time I followed the written part.
Posts: 138
Joined: Apr 2008
Reputation:
0
Most likely it's an issue with your internet connection, but perhaps github (where aeon's repository is stored) is having some connection issues. I'd try again later.
[04/03/2009 04:42:13PM Agent (Prashant_190023): "You are most welcome to the best democratic countries of the world -- India"] --Dell Chat
Posts: 646
Joined: May 2009
Reputation:
30
Odd.. I can't see the two folders that git created in win explorer - "Aeon Stark" and "Aeon Aruiga" - but can see them fine in git bash... ?
Also, when doing the checkout on the "Aeon Aruiga" folder to make it pull from the Aruiga branch, when you do the git pull after that, should it not grab all the updates/changes that go along with Aruiga?
I was assuming after doing the initial command that creates the folder, it was grabbing all the files from "master" which would be Stark.. but then when you do the "git checkout" command to repoint to Aruiga, would it not then need to grab everything that's different in that branch?
Posts: 138
Joined: Apr 2008
Reputation:
0
I'm not sure why you can't see the "Auriga Stark" and "Aeon Auriga" folders in Windows Explorer, but when you do git clone I believe it downloads everything, including changes on other branches. In this case it wouldn't be detrimental since Aeon only has two branches, but on a much larger project you certainly wouldn't want to use git clone unless you were setting up another group repository. At least, that's my understanding.
[04/03/2009 04:42:13PM Agent (Prashant_190023): "You are most welcome to the best democratic countries of the world -- India"] --Dell Chat
Posts: 646
Joined: May 2009
Reputation:
30
Ok, well it appears it's a Vista thing
Redid the process under XP and folder showing up no problems
Anyone know if there's some stupid security issue setting in Vista that is causing the skin folders from not being visible that I could be missing?
Yes, I did check for showing hidden files/folders