Roll20 uses cookies to improve your experience on our site. Cookies enable you to enjoy certain features, social sharing functionality, and tailor message and display ads to your interests on our site and others. They also help us understand how our site is being used. By continuing to use our site, you consent to our use of cookies. Update your cookie preferences .
×
Create a free account

One-click pull request problem

1645045374
David M.
Pro
API Scripter
On Monday AM EST I submitted a pull request ("Spawn v0.24, SmartAoE v0.25 #1456") to update SpawnDefaultToken from v0.21 to 0.24 and to initiate my SmartAoE script. Got the "all checks have passed" and "This branch has no conflicts..." validation confirmations on my second attempt that morning after realizing an error and closing my first pull request. However, neither script seemed to go through.  When I open the pull request in Github and look at the "Checks" tab, I see the following error (" The head commit for this pull_request event is not ahead of the base commit. Please submit an issue on this action's GitHub repo. ")  Any ideas what is going on here? SmartAoE is my first script that has a dependency (libInline). Could it be related to that, something I messed up? My version of libInline is older that the current one-click version, but since the dependency field in the script.json only has the dependent script name with no version info I assumed it would just look for the latest one-click version of libInline. Is that not the case?  
1645071555
The Aaron
Roll20 Production Team
API Scripter
My guess is that you didn't update your fork from upstream before sending your pull request. Or maybe something similar. GitHub can be confusing.  I'd trash that pull request, update your firm from Roll20 (possibly stashing your changes if needed), then send a new pull request. 
1645099387
David M.
Pro
API Scripter
Ok I'll give it a shot. Thanks, Aaron!
1645111820
keithcurtis
Forum Champion
Marketplace Creator
API Scripter
It's soooo much easier to do an upstream merge on github these days, now that there's a button for it.