veryroundbird.house / core
forked from tangled.org/core
this repo has no description
fork atom

appview: fix stack merging

the current PR is already in the list of PRs to be merged, include only
PRs that are strictly below it for merge.

oppi.li ea4b520a ff73ca23

options
unified split
Changed files
+1 -1
appview
state
pull.go
+1 -1
appview/state/pull.go 
···

       
1834

       
1834

       
 

       
		}


     

       
1835

       
1835

       
 

       



     

       
1836

       
1836

       
 

       
		// combine patches of substack


     

       
1837

       

       
-

       
		subStack := stack.Below(pull)


     

       

       
1837

       
+

       
		subStack := stack.StrictlyBelow(pull)


     

       
1838

       
1838

       
 

       
		// collect the portion of the stack that is mergeable


     

       
1839

       
1839

       
 

       
		mergeable := subStack.Mergeable()


     

       
1840

       
1840

       
 

       
		// add to total patch