Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add xml-model snippets. #752

Merged
merged 1 commit into from
May 31, 2020
Merged

Add xml-model snippets. #752

merged 1 commit into from
May 31, 2020

Conversation

BalduinLandolt
Copy link
Contributor

@BalduinLandolt BalduinLandolt commented May 31, 2020

This PR adds all the changes form #730, but this time it should work.
All requests for changes are included too.

Fixes #699.

Signed-off-by: Balduin Landolt balduin.landolt@hotmail.com

@angelozerr
Copy link
Contributor

angelozerr commented May 31, 2020

It seems perfect
Could you Add fixes in your commit with the issue number. See other commits to find samples

@BalduinLandolt
Copy link
Contributor Author

It seems perfect
Could you Add fixes in your commit with the issue number. See other commits to find samples

I added "fixes" to the PR description.
But can I change the commit message after I pushed? Or how can I do that?
(In any case, for future reference I'll add that right away, of course.)

@fbricon
Copy link
Contributor

fbricon commented May 31, 2020

git commit --amend is your friend. See https://help.github.com/en/github/committing-changes-to-your-project/changing-a-commit-message

If you pushed your branch already, then you'll need to force push (git push -f yourfork yourbranch), since you're rewriting history.

That's what you'll need to do since you need to fix the conflict in this PR

@BalduinLandolt
Copy link
Contributor Author

Allrighty... all conflicts resolved, all checks pass. Unless there are any further changes necessary, I'd say it can be merged. :)
(thanks @angelozerr and @fbricon for your patience!)

@BalduinLandolt
Copy link
Contributor Author

Never mind... I'll fix it and then try again. Sorry!

Adjust unit tests accordingly.

Fixes #699.

Signed-off-by: Balduin Landolt <balduin.landolt@hotmail.com>
@BalduinLandolt
Copy link
Contributor Author

Now I'm officially confused: No idea why CacheResourcesManagerTest.testAvailableCache:99 would fail on me.

@angelozerr angelozerr merged commit 3a5fe37 into eclipse-lemminx:master May 31, 2020
@angelozerr
Copy link
Contributor

Now I'm officially confused: No idea why CacheResourcesManagerTest.testAvailableCache:99 would fail on me.

It's not your fault, I created an issue for that #753

(thanks @angelozerr and @fbricon for your patience!)

@BalduinLandolt congrats for your first contribution! Contributing to a new project can be boring (need to sign some things, need to add some header, need to write commit with a given format, etc...), but now you have done that I think your future (I hope) contribution will be more easy to do. Anyway thank a lot for your PR!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[xml-model] Snippet to generate xml-model
3 participants