Skip to content

Drop references to develop branch #1008

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.

Sign up for GitHub

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

Open
jsoref wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Drop references to develop branch #1008

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/pull_request_template.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ Checklist
If you're unsure about any of the items below, don't hesitate to ask. We're here to help!
This is simply a reminder of what we are going to look for before merging your code.

- This PR is against **develop** branch (not applicable for hotfixes)
- This PR is against **master** branch
- You have included a link to the issue on GitHub or JIRA (if any)
- You have read the [CONTRIBUTING](https://github.com/scaleoutsystems/fedn/blob/master/CONTRIBUTING.md) doc
- You have included tests to complement my changes
Expand Down
4 changes: 2 additions & 2 deletions CONTRIBUTING.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,12 @@ Report a bug or propose a feature by [opening a new GitHub Issue](https://github
### Branches & Pull Requests

- **master** branch has the latest release of FEDn
- **develop** branch is where we add functionality and submit bugfixes
- **master** branch is where we add functionality and submit bugfixes
- if your branch introduces new functionality, name it **feature/[GitHub-Issue-ID]**
- if your branch resolves a bug, name it **issue/[GitHub-Issue-ID]**
- if your branch is a hotfix, name it **hotfix/[GitHub-Issue-ID]**

Open your pull requests against the **develop** branch unless you're resolving a critical bug in production (hotfix). Then your pull request should be against **master** branch.
Open your pull requests against the **master** branch.

### Code checks
We defined GitHub actions that check code quality and formatting against pushed branches and pull requests. We use:
Expand Down