Git for real this time.

[billw2015]

@JosEPh_II If you go to File>Options>Appearance you can select "Dark (beta)" and it will look like so:

I always have it in dark mode it is much nicer.

/edit Are you on Windows 7 by any chance?

 

[JosEPh_II]

@JosEPh_II If you go to File>Options>Appearance you can select "Dark (beta)" and it will look like so:
View attachment 533321

I always have it in dark mode it is much nicer.

/edit Are you on Windows 7 by any chance?

No, win 10 64 Pro

 

[billw2015]

Cool, it sounds like you already did the git setup if you saw what the diff view looks like? Did you follow the video or just work it out yourself?
Regardless feel free to start commiting to master then whenever you are ready, TB suggested tomorrow for official start of switch over, but no sense in waiting if you are already set up.
I am going to make a guide to using Github Desktop tonight (it will just be a bunch of gifs showing how to commit, pull, resolve conflicts, make branches, etc.), but hopefully it can be worked out just through experimentation.

 

[JosEPh_II]

Cool, it sounds like you already did the git setup if you saw what the diff view looks like? Did you follow the video or just work it out yourself?
Regardless feel free to start commiting to master then whenever you are ready, TB suggested tomorrow for official start of switch over, but no sense in waiting if you are already set up.
I am going to make a guide to using Github Desktop tonight (it will just be a bunch of gifs showing how to commit, pull, resolve conflicts, make branches, etc.), but hopefully it can be worked out just through experimentation.

I saw that from the GitHub site for C2C on git hub. I just put GitHub desktop on this morning but when I went to clone C2C I got C2Cgit and not the master folder with assets and such. So I'm still working my way thru it. I watched the vid you did once BUT it will take me more than one view to get it all straight.

So currently I can not commit to master as I have no copy of it in the GitHub desktop. and slow......and ..... and ...

 

[billw2015]

Cool, I hope it is the latest video you watched, as the original one was just for the test repository that is now defunct.
Latest video:

Correct repository:
https://github.com/caveman2cosmos/Caveman2Cosmos
I guess you got this one instead:

That is just a tool that we are using, not the correct repository!

 

[JosEPh_II]

Yeah I got the bottom one. I also just downloaded the C2C Master that has all the components and starts with .git instead of .svn. Hopefully that is the correct one. Will look at the vid in a little bit. Lunch time here in the cornfields of Illinois.

 

[billw2015]

If you are using the url to download it then it should look like this: https://github.com/caveman2cosmos/Caveman2Cosmos.git

However it shouldn't be necessary you can just do this:

1. Make sure Github desktop is *closed*
2. Go to https://github.com/caveman2cosmos/Caveman2Cosmos
3. Click the green "Clone or download" button and click "Open in Desktop"
4. It should open the Github desktop and ask you where to clone it to.

 

[Dancing Hoskuld]

All right, I now have a GitHub account under DancingHoskuld. I was trying out GitKraken awhile ago for my Civ IV mod (Paths of Glory ReDone) and thought I had set it up then.

 

[billw2015]

Okay invite sent.

 

[billw2015]

Some gifs for how to do a few basic operations in Github Desktop. If you want more please ask.

Fetch latest changes

Create a branch

Select specific changes in a file for committing

Commit specific changes from a file

Revert changes to a file

Publish a branch (send it to GitHub so others can see or use it)

Create a Pull Request (request for your branch changes to be merged into the main branch)

 

[Thunderbrd]

I'll get on this later today.

 

[billw2015]

Yeah it is all ready to go I think.

 

[Anq]

My ID is Anq-civfanatics. Seeing the repository listing complete really convinces me to join over at some time! I was too worried about what to do but now I feel more welcomed as long as I slow down and start to appreciate the new system and your collective work on it. Looking forward to adapting myself to this worthwhile platform. I like the prospect of such project management tools as the issue and project trackers. Hope this brings our team closer together!

 

[billw2015]

Invite sent!

 

[JosEPh_II]

My ID is Anq-civfanatics. Seeing the repository listing complete really convinces me to join over at some time! I was too worried about what to do but now I feel more welcomed as long as I slow down and start to appreciate the new system and your collective work on it. Looking forward to adapting myself to this worthwhile platform. I like the prospect of such project management tools as the issue and project trackers. Hope this brings our team closer together!

Of course you are Welcome and Wanted as well Anq!

 

[raxo2222]

@billw2015 why this video guide for GitHub Desktop was deleted?

 

[billw2015]

Its not, sorry I rearranged the readme, its linked at the top as Developer Setup.
Also embedded in this thread up there ^^^

 

[raxo2222]

Its not, sorry I rearranged the readme, its linked at the top as Developer Setup.
Also embedded in this thread up there ^^^

It is removed here. I clicked link to video guide in first post.

Spoiler :

DevSetup fails to compile assert DLL in Windows 7.

Spoiler :

Also how do you force command exe to English only?

 

[billw2015]

Please paste the error when compiling. How can I fix it otherwise?
/edit Also I did test on Windows 7, it worked okay, although I did need to install .NET 4.7. You can install it from here: https://www.microsoft.com/en-us/download/details.aspx?id=55170

 

[billw2015]

Yeah you need to install .NET 4.7, sorry I thought it would be installed on everyones machine already by Windows updates, but I guess not:
https://www.microsoft.com/en-us/download/details.aspx?id=55170