From b759cd800735d78d4ef6e9b2b0731a8f7a612bca Mon Sep 17 00:00:00 2001 From: dogi Date: Tue, 16 May 2017 18:33:10 -0400 Subject: [PATCH] Update internorientation.md (#800) --- pages/internorientation.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pages/internorientation.md b/pages/internorientation.md index 0f752f8cd..3fe0bab16 100644 --- a/pages/internorientation.md +++ b/pages/internorientation.md @@ -38,7 +38,7 @@ One of your responsibilities as an intern is to review and help prospective inte Every time you comment on an issue or review a pull request, message those involved on the [Gitter chat](https://gitter.im/open-learning-exchange/chat) with a link to the issue / pull request. Also if you find any issue with a pull request, do not forget to use the `Request changes` option when creating your review. ### Merging a pull request -If there are no issues remaining with a pull request, and at least two people have approved the pull request it can be merged, provided that there are no changes requested by another intern. When you go to merge the pull request, select Squash Merge, and **remove all of the commit message, and make sure the commit title is clear and short.** You can write “(fixes issue #)” and it will automatically close the issue that the pull request solves. If you forget, just manually go to the issue and close it, linking to the merged pull request. +If there are no issues remaining with a pull request, and at least two people have approved the pull request it can be merged, provided that there are no changes requested by another intern (exception is when virtual interns get added to the team - We want the new intern to do that themselfs during their interview). When you go to merge the pull request, select Squash Merge, and **remove all of the commit message, and make sure the commit title is clear and short.** You can write “(fixes issue #)” and it will automatically close the issue that the pull request solves. If you forget, just manually go to the issue and close it, linking to the merged pull request. Every time you merge a pull request, message the author on [Gitter in the chat room](https://gitter.im/open-learning-exchange/chat), make sure you include a link to the pull request and commit id.