UNCLASSIFIED - NO CUI

Skip to content
Snippets Groups Projects
Commit 5dc988b3 authored by joshwolf's avatar joshwolf
Browse files

Merge branch 'update-developer-docs-37184' into 'master'

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

See merge request platform-one/big-bang/bigbang!324
parents c2ec4d2c 7d73e4c4
No related branches found
No related tags found
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment