search

oreporan / wePlayMin

WePlay - the social football managing app
0 stars 1 forks source link

git branches part 2 #41

Open oreporan opened 8 years ago

oreporan commented 8 years ago

Hey, Since we have 3 public branches - server, client, master Soon we will have tests that run on client, and tests that run on server and client.

So what we will do is that once a week (or month, doesn't matter) - I will take the client branch, and the server branch, merge them with master, run the tests - and push the new master version.

So from now no one develop on master, this will only be done with the weekly merge

Ofcourse - if you want to make sure you are updated on client branch, just type 'git merge master'

Peace

Yahavw commented 8 years ago

👍

2016-01-02 16:26 GMT+02:00 oreporan notifications@github.com:

Hey, Since we have 3 public branches - server, client, master Soon we will have tests that run on client, and tests that run on server and client

So what we will do is that once a week (or month, doesn't matter) - I will take the client branch, and the server branch, merge them with master, run the tests - and push the new master version

So from now no one develop on master, this will only be done with the weekly merge

Peace

— Reply to this email directly or view it on GitHub https://github.com/oreporan/wePlayMin/issues/41.

nirla commented 8 years ago

okie

oreporan commented 8 years ago

I forgot to say - this means that when I release a new version (I will post it here), you need to pull this master to your client branch so you stay updated

oreporan commented 8 years ago

@Yahavw @nirla I made a new server + client merge in to master. To be updated with the latest code please do (from your branch):

git merge master