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.

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

Jump to bottom

v0.4.27: edited CONTRIBUTING.md #291

Merged
merged 1 commit into from
Aug 26, 2021
Merged

v0.4.27: edited CONTRIBUTING.md #291

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
8 changes: 4 additions & 4 deletions CONTRIBUTING.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,14 +31,14 @@ Contributing to an existing feature:
7. PR is queued for review
8. PR Reviewed (Update necessary if rejected)
9. PR Approved (There may be circumstances delaying the merge.)
10. Your contribution merged into next feature release on `org:main`
10. Your contribution merged into next feature release on `org:master`

### Recommended Strategy: [Rebase](https://git-scm.com/book/en/v2/Git-Branching-Rebasing)
1. Add cadCAD-org/cadCAD as remote within you forked project locally.
2. `git checkout remote/main`
3. `git pull remote main`
2. `git checkout remote/master`
3. `git pull remote master`
4. `git checkout your_branch`
5. `git rebase main`
5. `git rebase master`
6. Resolve merge conflicts (while leveraging rebase commands)
7. `git push fork your_branch`

Expand Down