Update pull_request_template.md (#198)

* Update pull_request_template.md

Moved Squash commits from post-merge to pre-merge.

* overriding default PR template for preferred LME template

* overriding default PR template for preferred LME template

* updating issue template to shorten the template

---------

Co-authored-by: mreeve-snl <[email protected]>

Author: llwaterhouse

.github/ISSUE_TEMPLATE/bug-or-error-report.md

@@ -15,26 +15,25 @@ assignees: ''
 If the above did not answer your question, proceed with creating an issue below: 
 
 ## Describe the bug
-A clear and concise description of what the bug is.
+<!-- A clear and concise description of what the bug is. -->
 
 ## To Reproduce
-Steps to reproduce the behavior. These should be clear enough that our team can understand your running environment, software/operating system versions, and anything else we might need to debug the issue. 
-
-An example of a usable reproducible list are shown in these issues: [Issue 1](https://github.com/cisagov/LME/issues/15) [Issue 2](https://github.com/cisagov/LME/issues/19). 
-
-To increase the speed and relevance of the reply we suggest you list down debugging steps you have tried, as well as the following information:
+<!-- Steps to reproduce the behavior. These should be clear enough that our team can understand your running environment, software/operating system versions, and anything else we might need to debug the issue.  -->  
+<!-- Good examples can be found here: [Issue 1](https://github.com/cisagov/LME/issues/15) [Issue 2](https://github.com/cisagov/LME/issues/19).  --> 
 
 ### Please complete the following information
-**Desktop:**
+#### **Desktop:**
  - OS: [e.g. Windows 10]
  - Browser: [e.g. Firefox Version 104.0.1]
  - Software version: [e.g. Sysmon v15.0, Winlogbeat 8.11.1]
-
-**Server:**
+ 
+#### **Server:**
 - OS: [e.g. Ubuntu 22.04]
 - Software Versions:
   - ELK: [e.g. 8.7.1]
   - Docker: [e.g. 20.10.23, build 7155243]
+
+**OPTIONAL**:
 - The output of these commands: 
 ```
 free -h
@@ -52,7 +51,7 @@ Increase the number of lines if your issue is not present, or include a relevant
 ## Expected behavior
 A clear and concise description of what you expected to happen.
 
-## Screenshots
+## Screenshots **OPTIONAL**
 If applicable, add screenshots to help explain your problem.
 
 ## Additional context

.github/PULL_REQUEST_TEMPLATE/pull_request_template.md renamed to .github/PULL_REQUEST_TEMPLATE.md

@@ -31,9 +31,9 @@
 
 - [ ] All tests pass
 - [ ] PR has been tested and the documentation for testing is above
+- [ ] Squash and merge all commits into one PR level commit 
 
 ## ✅ Post-merge Checklist
 
-- [ ] Squash all commits into one PR level commit 
 - [ ] Delete the branch to keep down number of branches