I meant renaming but you can't rename a branch in git so it would be replacing the master branch with a develop branch.
billw2015
King
- Joined
- Jun 22, 2015
- Messages
- 837
I don't mind really, does it have any implications? e.g 3rd party tools or github expecting there to be a master branch? I normally find in the long run it is a bad idea to violate established conventions in cases like this. I think people will not be too confused by master being the new trunk, especially if they don't use branching in SVN anyway and so aren't looking to choose a branch to work in.
On github you can set a default branch the name of the branch doesn't matter. Other projects have that changed as well like the unreal engine where the default branch is called release.
We can leave it like it is now i was just something i thought of.
We can leave it like it is now i was just something i thought of.
billw2015
King
- Joined
- Jun 22, 2015
- Messages
- 837
Currently we have 6 members in the git repository, so we have a few people missing.
If you have not yet done so, please signup at https://github.com/join and then send your account name to me or @alberts2 and we can add you to the project.
If you have not yet done so, please signup at https://github.com/join and then send your account name to me or @alberts2 and we can add you to the project.
JosEPh_II
TBS WarLord
If you did not know I'm on GitHub as cbltv1, not JosEPh_II
billw2015
King
- Joined
- Jun 22, 2015
- Messages
- 837
Ahhh okay thanks for clarifying! I had seen the name before but I thought it was someone else.
I created github account now - name is raxo2222
Now do I need three copies of caveman2cosmos?
One gameplay in BTS mods folder, and one for Github/SVN separately somewhere else?
Last edited:
billw2015
King
- Joined
- Jun 22, 2015
- Messages
- 837
Okay thanks, although it turns out only @alberts2 can add people to the appropriate group.
You only need one copy from git and thats it. It will link to the mods folder so you can play the git copy directly.
If you want to have other copies that is up to you of course. If you have specific requirements like merging with changes you have locally then you could set up a local branch that would allow you to easily merge into when you get update from git (of course I will help if you need/want).
JosEPh_II
TBS WarLord
I worked in that industry for 23 years and retired from it. That is my Pick up truck's license plate, cbltv 1.
You should recive a invitation to join Caveman2Cosmos on github.
@Dancing Hoskuld isn't here yet.
Same with @dsma_bell and @pepper2000
If some long gone modders come back they will be surprised.
billw2015
King
- Joined
- Jun 22, 2015
- Messages
- 837
The way I think this switch over will work (when we decide to kick it off, hopefully within the next few days):
- Anyone starting new fixes etc. move to git first.
- People in the middle of something can still commit to SVN up until we finalize the switchover.
- At some point we will switch the SVN trunk to taking automated release builds from git, at which point it can't be used for normal development any more (players/testers only).
- Any further work that needs to get to git somehow can either just be copied in via the git svn-import branch (I semi-automated this, it is quite easy), or go into an SVN branch, then into git the same way.
- Anyone starting new fixes etc. move to git first.
- People in the middle of something can still commit to SVN up until we finalize the switchover.
- At some point we will switch the SVN trunk to taking automated release builds from git, at which point it can't be used for normal development any more (players/testers only).
- Any further work that needs to get to git somehow can either just be copied in via the git svn-import branch (I semi-automated this, it is quite easy), or go into an SVN branch, then into git the same way.
Thunderbrd
C2C War Dog
Good to cover that plan.
That will be a bit of a project to get her setup. Maybe this weekend.
Thunderbrd
C2C War Dog
I know that I haven't yet done a lot to get setup myself here, just enough to sorta know what I'm doing.
I've been waiting for the point where Bill says we're ready to go purely Git for comitting changes. You can always get the SVN and maintain the one you have for updates but for commits, it should all be through GIT past a point.
That point is currently planned to be Saturday.
Any objections from the team?
I've been waiting for the point where Bill says we're ready to go purely Git for comitting changes. You can always get the SVN and maintain the one you have for updates but for commits, it should all be through GIT past a point.
That point is currently planned to be Saturday.
Any objections from the team?
JosEPh_II
TBS WarLord
None. If afterwards I can't get a commit to work I'll just upload the file here and let one of you all that do this on a regular basis do it.
Thunderbrd
C2C War Dog
I find it a little uncomfortable to use but it's something I can assume will get easier with practice. Shouldn't be any harder than SVN once you know the steps to take.
JosEPh_II
TBS WarLord
This is just a personal nitpick so read it as such. When looking into the xml in git and,for example CivicInfos.xml, I find the color of green used seems to bother my eyes. Like I said a silly nitpick. I'm sure there is a way to make that color a bit deeper or another color easier on 
eyes. 
eyes.
Thunderbrd
C2C War Dog
There are multiple programs you can use for that and I'm sure, like with notepad++, you can probably set color defaults in settings?This is just a personal nitpick so read it as such. When looking into the xml in git and,for example CivicInfos.xml, I find the color of green used seems to bother my eyes. Like I said a silly nitpick. I'm sure there is a way to make that color a bit deeper or another color easier on
