UNCLASSIFIED - NO CUI

update developer docs

Summary

I noticed that the command to squash commits only does the squash and does not actually do the rebase.

git reset $(git merge-base origin/main $(git rev-parse --abbrev-ref HEAD))

The main change to the docs is to add the command to rebase

git rebase origin/master

or

git rebase origin/main

as the final step before asking for merge approvals

Edited by kevin.wilder

Merge request reports

Loading