Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

minor fix for swift function #97

Merged
merged 1 commit into from
Apr 23, 2020
Merged

Conversation

lidongze91
Copy link
Contributor

No description provided.

@lidongze91
Copy link
Contributor Author

@lukasgit Hi, can you merge this? Thanks.

@mehmetf mehmetf merged commit 2844aeb into lukasgit:master Apr 23, 2020
@lukasgit
Copy link
Owner

@mehmetf please stop merging directly into master branch. I emailed you yesterday about this.

PR's must go to staging branch

@mehmetf
Copy link
Collaborator

mehmetf commented Apr 23, 2020

I did not receive the email. I do apologize.

Is there a more extensive guide to contributing? I see : "If you want to contribute code please create a pull request under the staging branch." A series of git commands on how to do this would go a long way.

Do you have a process on when/how staging commits make it to master? We pull in master branch into our internal repo. The primary motivation for us to become contributors to this repo was to be able to quickly push fixes/features to it and consume them downstream. I would like to avoid any delays that staging -> master would introduce to this process as that would defeat the purpose. For instance, if you go on vacation and cannot review/merge to master for a couple of weeks.

Thanks for letting us know so we can be in compliance with your repo rules in the future.

@lukasgit
Copy link
Owner

The only requirement is to push PR's to staging first, then merge those changes with master. Keeps everything clean and organized.

I'll look into a more extensive guide to contributing but right now my plate is incredibly full. Many thanks for your help!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants