File tree Expand file tree Collapse file tree
treebase-web/src/main/webapp/WEB-INF Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -191,7 +191,9 @@ jobs:
191191 # Pull with rebase to handle concurrent updates
192192 git pull --rebase origin gh-pages || {
193193 echo "Rebase failed, attempting force push"
194+ git rebase --abort
194195 git push --force
196+ exit 0
195197 }
196198 git push
197199 fi
Load Diff This file was deleted.
Load Diff This file was deleted.
Original file line number Diff line number Diff line change 10041004 <prop key =" /user/exportRowSegmentData.html" >exportRowSegmentDataController</prop >
10051005 <prop key =" /user/exportRowSegmentTemplate.html" >exportRowSegmentTemplateController</prop >
10061006
1007- <prop key =" /test/testParser.html" >treeParserController</prop >
1008-
10091007 <prop key =" /admin/userManagement.html" >userManagementController</prop >
10101008 <prop key =" /admin/selectStudies.html" >selectStudiesController</prop >
10111009 <prop key =" /admin/changeStudyStatus.html" >changeStudyStatusController</prop >
You can’t perform that action at this time.
0 commit comments