Skip to content

Allow mixed-case scopes on import from eduGAIN #2

Merged
merged 1 commit into from Feb 26, 2019
Merged

Conversation

iay
Copy link
Contributor

@iay iay commented Feb 25, 2019

See inc-meta#98.

I thought I'd go through the process of doing this on a simple branch so that we could see what that looks like. I'll also be interested to see what the merge process looks like, as it's been a while since I have seen that on GitHub and they have supposedly improved it since I last looked; as a result in previous cases I have mostly performed merges manually with the CLI.

@nroy @dshafer

@iay
Copy link
Contributor Author

iay commented Feb 25, 2019

For this particular PR, because it is based from the head of the master branch, I see that we have the option of any of the three ways of merging it: via a merge commit (the general case), a squash-and-merge (which would be the same as it only has one commit) or via a rebase. For something like this, the last option is probably the simplest as the PR already includes the details of the change. For something more complex, one of the other options would be better because the explicit merge commit adds information.

@iay iay merged commit 83be50b into master Feb 26, 2019
@iay iay deleted the inc-meta-98-scopes branch February 26, 2019 14:37
Sign in to join this conversation on GitHub.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

1 participant