T3S icon indicating copy to clipboard operation
T3S copied to clipboard

Sync between branches

Open moodmosaic opened this issue 10 years ago • 2 comments

Currently the dev branch is 49 commits behind master branch (and some commits ahead, which is expected).

Wouldn't it be easier if the dev branch could be at least 0 commits behind master?

moodmosaic avatar Apr 05 '14 08:04 moodmosaic

I'm not sure how to do that, i'll look into it

Railk avatar Apr 05 '14 10:04 Railk

I've done a bit of work on the dev branch before reading this. I'll try to (maybe manually) merge the fixes made in the master branch into my dev based improvements branch. Have a look: https://github.com/Phaiax/T3S/tree/improvements Ill create a pull request soon, then we can discuss about the changes.

Phaiax avatar Jun 12 '14 18:06 Phaiax