artem-zinnatullin / android-wail-app

DEPRECATED Android Last.fm scrobbler. Recruiters: please don't look at this project.
MIT License
121 stars 36 forks source link

Rename 'develop' to 'master' #187

Closed regisd closed 9 years ago

regisd commented 9 years ago

Please follow the git convention and rename 'develop' to 'master'.

artem-zinnatullin commented 9 years ago

JFYI: I am not a fan of standard Git Flow for about 1.5 years, here is article that shares same opinions as mine, take a look :) http://endoflineblog.com/gitflow-considered-harmful

+1 for renaming develop to master and simplifying our Git Flow into one branch with tags and feature/fix branches for PRs ((with squashing into one commit before merge).

@ilya-murzinov what do you think?

ilya-murzinov commented 9 years ago

Sure, master branch is currently useless.

artem-zinnatullin commented 9 years ago

@ilya-murzinov can you please do it and leave one main branch in the repo?

ilya-murzinov commented 9 years ago

@artem-zinnatullin, I think I don't have enough rights to do this.

$ git push upstream --delete develop
Username for 'https://github.com': ilya-murzinov
Password for 'https://ilya-murzinov@github.com':
remote: error: refusing to delete the current branch: refs/heads/develop
To https://github.com/artem-zinnatullin/android-wail-app
 ! [remote rejected] develop (deletion of the current branch prohibited)
error: failed to push some refs to 'https://github.com/artem-zinnatullin/android
-wail-app'
artem-zinnatullin commented 9 years ago

Nope, problem is that develop is currently default branch in GitHub repo settings, just change it to master.

BTW, please don't forget to merge develop into master before dropping develop branch.

On Wed, Jul 15, 2015 at 7:37 PM, Ilya Murzinov notifications@github.com wrote:

@artem-zinnatullin https://github.com/artem-zinnatullin, I think I don't have enough rights to do this.

$ git push upstream --delete develop Username for 'https://github.com': ilya-murzinov Password for 'https://ilya-murzinov@github.com': remote: error: refusing to delete the current branch: refs/heads/develop To https://github.com/artem-zinnatullin/android-wail-app ! [remote rejected] develop (deletion of the current branch prohibited) error: failed to push some refs to 'https://github.com/artem-zinnatullin/android -wail-app https://github.com/artem-zinnatullin/android-wail-app'

— Reply to this email directly or view it on GitHub https://github.com/artem-zinnatullin/android-wail-app/issues/187#issuecomment-121672267 .


Best regards, Artem Zinnatullin Sent from my bed.

ilya-murzinov commented 9 years ago

@artem-zinnatullin, yep, I know that I can't delete default branch, but I can't change it because I don't have rights :)

artem-zinnatullin commented 9 years ago

Oh, okay, changed to master!

ilya-murzinov commented 9 years ago

Done!