Cleaning up pull request improvement

[Robert Leach]

USE CASE: WHAT DO YOU WANT TO DO?

Have code reviews with conflicts mitigated

STEPS TO REPRODUCE AN ISSUE (OR TRIGGER A NEW FEATURE)

Submit a pull request from a feature branch after the master has changed through the efforts of another developer who is working in parallel.

CURRENT BEHAVIOR

The document review of a pull request must deal with merge issues.

EXPECTED BEHAVIOR

A document review on a pull request where there are no unresolved conflicts.

DEVELOPERS ONLY SECTION

SUGGESTED CHANGE (Pseudocode optional)

1. Formalize the nature of feature branches such that they address a minimum of related issues, ideally 1.
2. In cases of large/long-running feature branches, merge the master branch into the feature branch before submitting the pull request.
3. Formalize how conflicts are dealt with in a document review.

Change the SCMP to reflect these tenets.

FILES AFFECTED (where the changes will be implemented) - developers only

1. SCMP_TreeView3.doc
2. merge_request_form.txt
3. (Possibly) document_review_form.txt

LEVEL OF EFFORT - developers only

minor

COMMENTS

[Robert Leach]

Resolved on branch "issue302...".

[Robert Leach]

Merged to master.

[Robert Leach]

Removing milestone: Software Engineering (automated comment)