Need some help with "git"

[thepan]

Hey everybody,

 

recently i tried to get into using git for development and got ended up with some roadblocks.

 

1. Which way is the recommended here?

 

Way 1: Fork PS on github then clone my fork onto my server. Change files on server then push back to my github fork.

           Special question here: How to i pull new changes from the PS repository into my fork or clone on server?

 

Way 2: Clone the PS repository directly onto my server, then push everything onto a new repository of mine.

 

 

2. After cloning the repository i want to get the modules aswell so i do

$ git submodule init

then

$ git submodule update

it works but is this the best way? How would i keep modules uptodate? And how can i push the completes module folders onto my github repository as actual folders not submodule links?

 

Maybe some of the devs could give some input here.

Edited June 30, 2015 by thepan (see edit history)