Trying to edit profile.

[jwflory]

Hi @kawedi! It looks like your git fork master branch fell behind from the FOSSRIT master branch. GitHub is blocking the Pull Request from being merged because of a merge conflict.

In this kind of situation, there are two ways to proceed:

1. Close, rebase, resubmit: Close the Pull Request. Pull latest changes from upstream project into your fork. Make your changes again, and open a new Pull Request.
2. Rebase and push: Checkout to your git branch where your changes are. Rebase from the upstream project into your git branch. Solve the merge conflicts as prompted by git. Once merge conflicts are solved, push changes to your branch. Pull Request should be able to be merged.

In this case, I suggest we close and you resubmit. I think these changes are already upstream, so you might not have to make any changes after all. Also, if you are new to git rebasing, here are some helpful guides that explain how it works:

• Workflow:
  • Git Feature Branch Workflow
  • GitHub Standard Fork & Pull Request Workflow
• Rebasing:
  • Don't Be Scared of git rebase
  • How to Rebase a Pull Request
  • The Git Rebase Introduction I Wish I'd Had