The Middle Earth Project Forum Index
 
 
 
The Middle Earth Project Forum IndexFAQSearchRegisterLog in

GitHub
Goto page: 1, 2, 3  >
 
Post new topic   Reply to topic    The Middle Earth Project Forum Index -> The Team Forum -> Archive
Previous topic :: Next topic  
Author Message
Redit
Modérateur

Offline

Joined: 06 Mar 2013
Posts: 1,017
Localisation: Angleterre

PostPosted: Wed 15 Oct - 19:03 (2014)    Post subject: GitHub Reply with quote

I've starting using GitHub for new versions of the mod, it is a build software which allows you to accurately track changes to files across the whole project, this will be the most up to date and complete list of changes and additions and the whole team can work on it together

Dropbox doesn't let you track changes or make subversions in the same way, so although it is useful to share files GitHub is much better for patches and file updates

If you want permission to edit the MEP GitHub, make an account and let me know

Here's the broad strokes of how to use Github btw.

There is the main 'repository' of the Middle-Earth-Project-Team called CK2MEP.

When you are added to the team 'organisation' you will have access to make 'Commits' to the repository, this just means making a change to a file or adding a file to the 'repository' (mod folder).

The main way you should do this is make a 'branch' with your name and what you are adding, e.g. Redit - New Province Map. This makes a seperate 'branch' of the mod with the changes you add (new files, etc) without applying them to the master branch. Once you have done this you can make a 'Pull Merge Request' to the main 'master' branch which informs everyone of the changes and allows comments etc to be made before you finally confirm the Pull Request and merge the branch with the master branch, making a 'commit'.

You can also directly commit by editing files directly, but this won't make a request.

You can see a full list of all 'Commits' ever made, who by, what they changed (text side by side or unified), when they made the changes, etc...

There are also 'Issues', which is a way of keeping track of ongoing bugs and things that need to be fixed/added, these can be tracked by all team members and commented on like Pull Requests.

If you want to work on your own private version of the mod without affecting anyone else files within Github, you need to make a 'Fork' of the Team CK2MEP to your own account, this is seperate and won't affect the main team one, but you can also make Pull Requests between the team folder and your own 'fork'.


I know this is all pretty complicated compared to Dropbox, was daunting at first Wink, so if you need any help with it let me know and I'll try and help you out.

To create a branch you click where it says Branch: master and it will say Find or create branch and you type a name in and press Create.

I've also learned it's best to download the GitHub desktop program and then Sync it with the Team MEPCK2 repository. Then you can edit any files within the actual folders on your computer and when you are done Sync the GitHub program and then Commit all your changes at onc I can go through this step by step if need be

DL desktop program here: https://windows.github.com/


Last edited by Redit on Tue 11 Nov - 14:16 (2014); edited 2 times in total
Back to top
Visit poster’s website Skype
Publicité






PostPosted: Wed 15 Oct - 19:03 (2014)    Post subject: Publicité

PublicitéSupprimer les publicités ?
Back to top
Lonhaldar
Administrateur

Offline

Joined: 06 Mar 2013
Posts: 3,190
Localisation: France

PostPosted: Sun 9 Nov - 12:16 (2014)    Post subject: GitHub Reply with quote

I just created my account on Github, with the username Lonhaldar Wink
Back to top
Chris93
Team

Offline

Joined: 05 Apr 2013
Posts: 1,965
Localisation: Italia

PostPosted: Sun 9 Nov - 12:29 (2014)    Post subject: GitHub Reply with quote

I'm on github too, Chris1993 is my username  Wink
Now, please, give me a complete and working build so I can come back to work  Very Happy
Back to top
Lonhaldar
Administrateur

Offline

Joined: 06 Mar 2013
Posts: 3,190
Localisation: France

PostPosted: Sun 9 Nov - 12:35 (2014)    Post subject: GitHub Reply with quote

It's uploading on dropbox currently Very Happy
Back to top
Redit
Modérateur

Offline

Joined: 06 Mar 2013
Posts: 1,017
Localisation: Angleterre

PostPosted: Sun 9 Nov - 16:35 (2014)    Post subject: GitHub Reply with quote

Alright will add you guys to the MEP team group. You need the desktop program also, which you will need to Sync so you get all the files, but first I need to change the GitHub build to Lons new one so we can go from there
Back to top
Visit poster’s website Skype
Redit
Modérateur

Offline

Joined: 06 Mar 2013
Posts: 1,017
Localisation: Angleterre

PostPosted: Sun 9 Nov - 17:03 (2014)    Post subject: GitHub Reply with quote

You should have been invited, let me know if not and I've invited the wrong people Very Happy.

I am updating the main repository to 0.4.1b, Lon's build.

If you need any help with how to use GitHub let me know, it's a little more complicated than Dropbox, but it allows all of us to be working on different additions in our own branches and track each others changes etc
Back to top
Visit poster’s website Skype
Athoen
Team

Offline

Joined: 29 Jul 2014
Posts: 291
Localisation: Réunion

PostPosted: Mon 10 Nov - 13:46 (2014)    Post subject: GitHub Reply with quote

logged in GitHub : Athoen974
Back to top
Redit
Modérateur

Offline

Joined: 06 Mar 2013
Posts: 1,017
Localisation: Angleterre

PostPosted: Mon 10 Nov - 16:50 (2014)    Post subject: GitHub Reply with quote

Inviting you now Athoen.

Here's the broad strokes of how to use Github btw, I'll add this to the original post too.

There is the main 'repository' of the Middle-Earth-Project-Team called CK2MEP.

When you are added to the team 'organisation' you will have access to make 'Commits' to the repository, this just means making a change to a file or adding a file to the 'repository' (mod folder).

The main way you should do this is make a 'branch' with your name and what you are adding, e.g. Redit - New Province Map. This makes a seperate 'branch' of the mod with the changes you add (new files, etc) without applying them to the master branch. Once you have done this you can make a 'Pull Merge Request' to the main 'master' branch which informs everyone of the changes and allows comments etc to be made before you finally confirm the Pull Request and merge the branch with the master branch, making a 'commit'.

You can also directly commit by editing files directly, but this won't make a request.

You can see a full list of all 'Commits' ever made, who by, what they changed (text side by side or unified), when they made the changes, etc...

There are also 'Issues', which is a way of keeping track of ongoing bugs and things that need to be fixed/added, these can be tracked by all team members and commented on like Pull Requests.

If you want to work on your own private version of the mod without affecting anyone else files within Github, you need to make a 'Fork' of the Team CK2MEP to your own account, this is seperate and won't affect the main team one, but you can also make Pull Requests between the team folder and your own 'fork'.

I know this is all pretty complicated compared to Dropbox, was daunting at first Wink, so if you need any help with it let me know and I'll try and help you out.
Back to top
Visit poster’s website Skype
Athoen
Team

Offline

Joined: 29 Jul 2014
Posts: 291
Localisation: Réunion

PostPosted: Mon 10 Nov - 17:24 (2014)    Post subject: GitHub Reply with quote

Joined
2 files should be deleted from current build (old versions before renamed, current orc buildings are in 05_orc...) :
in common/buildings :
00_Orccastle.txt
00_Orccity.txt
Back to top
Redit
Modérateur

Offline

Joined: 06 Mar 2013
Posts: 1,017
Localisation: Angleterre

PostPosted: Mon 10 Nov - 17:28 (2014)    Post subject: GitHub Reply with quote

Deleted, but in future you can delete them yourself, simply click on it, press the trash can then provide an explanation at the bottom and confirm Smile

I also made some examples Issues, feel free to make new ones or add to discussions
Back to top
Visit poster’s website Skype
Moridin997
Team

Offline

Joined: 05 Jul 2014
Posts: 314

PostPosted: Mon 10 Nov - 18:05 (2014)    Post subject: GitHub Reply with quote

logged in GitHub : Moridin997
Back to top
Redit
Modérateur

Offline

Joined: 06 Mar 2013
Posts: 1,017
Localisation: Angleterre

PostPosted: Mon 10 Nov - 18:09 (2014)    Post subject: GitHub Reply with quote

Invited you Moridin
Back to top
Visit poster’s website Skype
Moridin997
Team

Offline

Joined: 05 Jul 2014
Posts: 314

PostPosted: Mon 10 Nov - 18:14 (2014)    Post subject: GitHub Reply with quote

It seems GitHub hasn't realized that yet...
Back to top
Redit
Modérateur

Offline

Joined: 06 Mar 2013
Posts: 1,017
Localisation: Angleterre

PostPosted: Mon 10 Nov - 19:02 (2014)    Post subject: GitHub Reply with quote

Not sure how to make a whole load of changes to different files (e.g. tribal holdings province files) into just one commit like you did Lon (Some Fixes)
Back to top
Visit poster’s website Skype
Lonhaldar
Administrateur

Offline

Joined: 06 Mar 2013
Posts: 3,190
Localisation: France

PostPosted: Mon 10 Nov - 19:15 (2014)    Post subject: GitHub Reply with quote

i'm just changing several files before sending the commit Wink
Back to top
Contenu Sponsorisé






PostPosted: Today at 10:31 (2017)    Post subject: GitHub

Back to top
Display posts from previous:   
Post new topic   Reply to topic    The Middle Earth Project Forum Index -> The Team Forum -> Archive All times are GMT + 1 Hour
Goto page: 1, 2, 3  >
Page 1 of 3

 
Jump to:  

Index | Administration Panel | Forum hosting | Free support forum | Free forums directory | Report a violation | Conditions générales d'utilisation
Template lost-kingdom_Tolede created by larme d'ange
Powered by phpBB © 2001, 2005 phpBB Group