File tree Expand file tree Collapse file tree 3 files changed +14
-0
lines changed Expand file tree Collapse file tree 3 files changed +14
-0
lines changed Original file line number Diff line number Diff line change @@ -25,6 +25,7 @@ export const apply: BranchSequencerBase = (args) =>
2525 // callbackAfterDone: defaultApplyCallback,
2626 delayMsBetweenCheckouts : 0 ,
2727 behaviorOfGetBranchBoundaries : BehaviorOfGetBranchBoundaries [ "parse-from-not-yet-applied-state" ] ,
28+ reverseCheckoutOrder : false ,
2829 } ) . then (
2930 ( ret ) => ( markThatApplied ( args . pathToStackedRebaseDirInsideDotGit ) , ret ) //
3031 ) ;
Original file line number Diff line number Diff line change @@ -121,4 +121,16 @@ export const forcePush: BranchSequencerBase = (argsBase) =>
121121 */
122122 behaviorOfGetBranchBoundaries :
123123 BehaviorOfGetBranchBoundaries [ "ignore-unapplied-state-and-use-simple-branch-traversal" ] ,
124+
125+ /**
126+ * (experimental)
127+ *
128+ * github just closed (emptily merged) one of the PRs
129+ * because some commit was now already part of some other branch.
130+ *
131+ * pretty sure that pushing newest branches first, and oldest later,
132+ * instead of the current "oldest first, then newest",
133+ * would solve this.
134+ */
135+ reverseCheckoutOrder : true ,
124136 } ) ;
Original file line number Diff line number Diff line change @@ -299,6 +299,7 @@ export const gitStackedRebase = async (
299299 BehaviorOfGetBranchBoundaries [
300300 "if-stacked-rebase-in-progress-then-parse-not-applied-state-otherwise-simple-branch-traverse"
301301 ] ,
302+ reverseCheckoutOrder : false ,
302303 } ) ;
303304 } else {
304305 /**
You can’t perform that action at this time.
0 commit comments