Posts: 59
Joined: May 2009
Reputation:
0
is there some additional structure i need to add to the folder ?? git tells me it's not a git folder when i extract the zip to a new folder and try to run git pull ;/
Posts: 138
Joined: Apr 2008
Reputation:
0
You still need to initialize the folder with the steps I posted above. Just cancel out of the "git pull" function that always fails on you, and manually copy the files into that directory you created with the guide.
[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: 138
Joined: Apr 2008
Reputation:
0
I think the problem has to do with the original "checkout" command you run to switch branches. As you can see from the prompts after that, the branch is still "master". What operating system are you running?
[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: 69
Joined: Nov 2008
Reputation:
0
2009-06-22, 22:05
(This post was last modified: 2009-06-22, 22:14 by Wraith88.)
I'm using Git Gui and wanted to know how to update. There's a push command but no update/pull.
nevermind: figured it out. Fetch+ Merge
Posts: 15
Joined: Feb 2009
Reputation:
0
Farakh
Junior Member
Posts: 15
Yesterday I downloaded the latest Auriga and I seem to have lost the back drops on the home page, its just black. I have set the correct path in the settings but it still doesn't show any backdrops.
Posts: 5,184
Joined: Jan 2009
Reputation:
131
Ok guys I started to download Black's mod with git (I use TortoiseGit because it looks similar to TortoiseSVN which I use every day at work).
I did some changes to the XML files (fixed an issue and now I'm playing around with a language flag) and then wanted to get the newest things from git. But git always says that it can't get the newest files because they can't be merged with the files I've changed. Am I missing something or isn't it possible to merge local changes with remote updates like with SVN?
Thx for helping me out.
Always read the
online manual (wiki),
FAQ (wiki) and search the forum before posting.
Do not e-mail Team Kodi members directly asking for support. Read/follow the
forum rules (wiki).
Please read the pages on
troubleshooting (wiki) and
bug reporting (wiki) before reporting issues.
Posts: 49
Joined: May 2009
azido Wrote:i was going to ask that for myself, finding that fetch + merge seems to be the equivalent for git pull on commandline.
I was going to ask this too
...but in Git Gui, do you mean:
Remote -> Fetch From -> *name* ?
because I can't find Fetch + Merge anywhere.
Posts: 65
Joined: Dec 2008
Reputation:
0
how big is everybody's .git folder? Mine is 1.06 gb which strikes me as a tad excessive.