Skip to content

Working with dependent PRs

Eric Wieser edited this page Jul 2, 2024 · 7 revisions

You make a branch with some cool feature:

%%{init: { 'logLevel': 'debug', 'theme': 'base', 'gitGraph': {'showBranches': true, 'showCommitLabel':true,'mainBranchName': 'master'}} }%%
gitGraph
   commit
   branch feature-1
   commit
   commit
   commit
   checkout master
Loading

Then you build another PR on top of that

%%{init: { 'logLevel': 'debug', 'theme': 'base', 'gitGraph': {'showBranches': true, 'showCommitLabel':true,'mainBranchName': 'master'}} }%%
gitGraph
   commit
   branch feature-1
   commit
   commit
   commit
   branch feature-2
   commit
   commit
Loading

Then your first PR gets bors merged and squashed into a commit on staging

%%{init: { 'logLevel': 'debug', 'theme': 'base', 'gitGraph': {'showBranches': true, 'showCommitLabel':true,'mainBranchName': 'master'}} }%%
gitGraph
   commit
   branch feature-1
   commit
   commit
   commit type: HIGHLIGHT
   branch feature-2
   commit
   commit
   checkout master
   commit
   branch staging
   commit id: "someone-elses-feature1"
   commit id: "feature-1" type: HIGHLIGHT
   commit id: "someone-elses-feature2"
Loading

And then bors finishes

%%{init: { 'logLevel': 'debug', 'theme': 'base', 'gitGraph': {'showBranches': true, 'showCommitLabel':true,'mainBranchName': 'master'}} }%%
gitGraph
   commit
   branch feature-1 type: HIGHLIGHT
   commit
   commit
   commit
   branch feature-2
   commit
   commit
   checkout master
   commit
   commit id: "someone-elses-feature1"
   commit id: "feature-1" type: HIGHLIGHT
   commit id: "someone-elses-feature2"
Loading