Pull request template

[josephfusco]

Adds a pull request template to the GitHub project.

See GitHub article: https://help.github.com/articles/creating-a-pull-request-template-for-your-repository/

This doesn't fix #271 but supports it.

[samikeijonen]

+1. I'd also need helpful text how to sync your local master branch with remote branch. And how to use rebase for custom PR branch after that. Or is that even suggested workflow.

[grappler]

@samikeijonen See this #90 (comment)

[enodekciw]

Both [.jscsrc] and [.jsintignore] should be linked to WordPress/twentyseventeen

[josephfusco]

@enodekciw good catch 👍

[samikeijonen]

Thanks @grappler for tip. First step (syncing master branch from this master branch) is crystal clear.

But I'm confused of command git reset --hard master after checking out on my svg branch. Wouldn't that make my svg branch exactly the same as master branch. And I would lose all the modifications I made on svg branch.

Shouldn't I use git rebase master command instead and try to solve merge conflicts manually?

[mor10]

@samikeijonen When I work on non-WP projects, we typically use a process like the one outlined in this article: https://github.com/edx/edx-platform/wiki/How-to-Rebase-a-Pull-Request

I have no idea if this is what the team is looking for, but it's a pretty clean and straight-forward process:

// Checkout master:
git checkout master
// Get the updates:
git pull --rebase upstream master
// Checkout your working feature branch:
git checkout [working branch]
// Rebase updates to the branch:
git rebase master
// resolve and commit conflicts (happens in editor context)
// Force the changes to the remote branch (pull request):
git push --force

If this is not a desirable methodology, please let me know.

[samikeijonen]

Thanks @mor10. That's pretty much the workflow I'm using also. But instead of git pull --rebase upstream master I sync the master branch like outlined in this article.

In #206 I probably used merge and messed PR. I'll try rebase this time in #253. Fingers crossed.