Help with git fu

I have a pending pull request that ran into conflicts because Bhroam snuck in some changes between the time I rebased this morning and the time my pull request was checked.

My git skills are not good enough to know what to do next. I have re-rebased my changes on this evening’s top-of-tree in my local copy of my fork, and fixed the conflicts:

On branch lessNAS
Your branch and 'drtoss/lessNAS' have diverged,
and have 2 and 1 different commits each, respectively.
  (use "git pull" to merge the remote branch into yours)

> git log --oneline | head -4
f5e1bf97 Remove unneeded #ifdef NAS code
694b4372 Refactor reconfirming reservations and nspec** -> vector (#2484)
1123b654 Collating DIS routines, removing unused (#2477)
12962f69 PTL create_moms() method creates moms if pbsnodes list is empty (#2481

What is the correct way to get the fixed patch to the maintainers? Do I force push my local branch over my fork on github? How do I let the maintainers know there is a new version to pull?

Thanks for any advice.

If you are sure that your local branch has the correct changes, then all that you should need to do now is a force push, i.e - git push -f drtoss lessNAS.

That worked. Thanks.