Skip to content

Commit

Permalink
[CONTRIBUTING.md] Add note that we prefer squash+merge when merging…
Browse files Browse the repository at this point in the history 
… PRs.
  • Loading branch information
@NHDaly
NHDaly authored Aug 2, 2021
1 parent ed13d09 commit f711f0a
Showing 1 changed file with 5 additions and 0 deletions.
5 changes: 5 additions & 0 deletions CONTRIBUTING.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -287,6 +287,11 @@ runtest harness).
- To remove whitespace relative to the `master` branch, run
`git rebase --whitespace=fix master`.

#### Git Recommendations For Pull Request Reviewers

- When merging, we generally like `squash+merge`. Unless it is the rare case of a PR with carefully staged individual commits that you want in the history separately, in which case `merge` is acceptable, but usually prefer `squash+merge`.


## Resources

* Julia
Expand Down

6 comments on commit f711f0a

@nanosoldier
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Executing the daily package evaluation, I will reply here when finished:

@nanosoldier runtests(ALL, isdaily = true)

@cc13ny
Copy link

@cc13ny cc13ny commented on f711f0a Aug 3, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@nanosoldier just wonder where the daily package evaluation can be executed?

@nanosoldier
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Your package evaluation job has completed - possible new issues were detected. A full report can be found here.

@KristofferC
Copy link
Member

@KristofferC KristofferC commented on f711f0a Aug 3, 2021 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe also add that best practice is for changes to go via PRs and not be pushed straight to master ;)

@cc13ny
Copy link

@cc13ny cc13ny commented on f711f0a Aug 3, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It seems that @nanosoldier is a bot account that runs CI?

@KristofferC
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes

Please sign in to comment.