1. Clone you repository
  2. Add original repository as a remote
  3. Fetch content from original repository
  4. Rebase your changes to be on top of original repo changes
  5. Fix conflicted files
  6. Git add each conflicted file
  7. Continue rebasing (you may get other conflicts, if so, back to 5)
  8. Push to your repository
  9. Create a new merge request