search

python-20 / video-downloader

A python application to download videos
GNU General Public License v3.0
10 stars 10 forks source link

Use a proper branching structure #30

Closed RyanSamman closed 4 years ago

RyanSamman commented 4 years ago

As in this article, we should have a better branching structure and versioning.

The master branch is what someone would download to use, and is finished and working.

The develop branch is the second real and permanent branch, used to test ideas and features.

The other branches are less important at this stage of the project, but include branches for features to be committed into the develop branch, hotfixes/major bug fixes, etc

chonix commented 4 years ago

I'd implement this once we have the playlists and single video nailed down.

cherylli commented 4 years ago

in summary, it looks like what we are already doing but instead of merging into master, we merge in a "dev" branch. and we only merge into master when its ready to release?

RyanSamman commented 4 years ago

Yeah, so if we add a feature which breaks everything, it doesn't mess with the people who are using it in production

I'll make a develop branch for now, push your changes there

cherylli commented 4 years ago

As per discussion on discord, keep doing we're doing now and push to release branch later on. They are essentially the same thing.

cherylli commented 4 years ago

Contributing.Md