Development > Newbie Coding
The GIT problem
geever:
--- Quote from: Malick on February 12, 2011, 05:09:15 pm ---
--- Code: ---gcc: Files\CodeBlocks\MinGW\include: No such file or directory
windres.exe: preprocessing failed.
--- End code ---
This is strange, as all paths seem to be correct. Toolchain executables set to
--- Code: ---C:\Program Files\CodeBlocks\MinGW\
--- End code ---
--- End quote ---
I remember CodeBlock didn't like path with space in it. Maybe this is the problem?
-geever
Malick:
--- Quote ---I remember CodeBlock didn't like path with space in it. Maybe this is the problem?
--- End quote ---
D'oh...
After all this development, it can still not take spaces ? We're back to Win 3.1 ! ::)
Thanks geever, it works now :) I can update the sources and compile...
Now I'll figure how to mess with the code ^^
By the way, with Git what is the 'smartest' solution to upload any modification : patch, push, commit ... ?
Malick
bayo:
like svn, it is commit/push. but the game is not free as you-can-do-what-ever-u-want-on-the-repository. U need rights to push things.
Patch is the way to star't contributing. It is nice to create patch with git metatdata, like author and so on, cause it is very easy to apply.
Malick:
Hi Bayo,
No prob, I will start with 'patch' for a start :)
Thanks for the help, anyway. I'll have plenty other silly questions (in a separate thread !)
Malick
EDIT : OK, I do need help. I want to create a patch and to submit it here (I created a topic)
Problem : when I click on "Create Patch Serial", well, I don't see anything happening. Any help appreciated :)
Thanks for your patience with noobs like me !
Malick:
Gents,
I need some help with GIT, it's puzzling me ????
I tried to update the sources with PULL command. Now, I have some weird artifacts which I have to track and erase one by one, such as :
--- Quote ---...soldiers 1
scientists 3
<<<<<<< HEAD
=======
workers 1
>>>>>>> 36011dc324793d8b64cd5d4d72c28c2c45de39b8
pilots 1
pos "-46 26"
--- End quote ---
And GIT now refuse to commit any change, because I have unmerged files. When I try to merge them, it tells me that I can't, because, I have some unmerged files...
Any help appreciated !
Malick
Navigation
[0] Message Index
[#] Next page
[*] Previous page
Go to full version