dffml icon indicating copy to clipboard operation
dffml copied to clipboard

Published 20 hours ago • verified publisher icon intel

docs: contributing: git: Rebasing in changes

Open pdxjohnny opened this issue 2 years ago • 3 comments

Document how to rebase in branches

pdxjohnny avatar Mar 18 '22 21:03 pdxjohnny

Co-authored-by: Brent Watkins [email protected]

sequenceDiagram
    upstream/main->>+feature_branch: git pull --rebase upstream main
    feature_branch->>+origin/feature_branch: git push --force
    origin/feature_branch->>+upstream/main: pull request

```mermaid
sequenceDiagram
    upstream/main->>+feature_branch: git pull --rebase upstream main
    feature_branch->>+origin/feature_branch: git push --force
    origin/feature_branch->>+upstream/main: pull request

pdxjohnny avatar Mar 18 '22 22:03 pdxjohnny

Working on it.

Onkar627 avatar Mar 21 '22 05:03 Onkar627

This might be helpful: https://trunkbaseddevelopment.com/short-lived-feature-branches/

pdxjohnny avatar Mar 21 '22 16:03 pdxjohnny