Note

Always do a git pull from main first, then push your changes to dev. In this case you can merge to main after copying over the functions. To merge it should be something like

git checkout main
git merge dev
git push origin main

More details here

https://www.varonis.com/blog/git-branching