Skip to content

Commit

Permalink
Merge pull request #209 from mcwumbly/patch-1
Browse files Browse the repository at this point in the history
Use "pull request" instead of "merge request"
  • Loading branch information
Ciro S. Costa authored Oct 6, 2021
2 parents 9e1da8b + 47fc95c commit 70c56c0
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -157,13 +157,13 @@ make test-kuttl-kind # see below section about testing with a full cluster.
```


## Merge Request Flow
## Pull Request Flow

Often, code in a merge request will be worked on by a pair from the team maintaining Catographer.
In this case, a merge request should be made by one engineer. The second engineer should approve
the merge request. If the work is not blocking other stories, the merge request should stay open
overnight, to allow others on the team time to read. The following morning, a merge should be
completed.
Often, code in a pull request will be worked on by a pair from the team maintaining Catographer.
In this case, a pull request should be made by one engineer. The second engineer should approve
the pull request. If the work is not blocking other stories, the pull request should stay open
overnight, to allow others on the team time to read. The following morning, the pull request should be
merged.


## Maintaining a useful commit history
Expand Down

0 comments on commit 70c56c0

Please sign in to comment.