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

Tracking Vector documentation #1590

Merged
merged 3 commits into from
Jan 17, 2020
Merged

Tracking Vector documentation #1590

merged 3 commits into from
Jan 17, 2020

Conversation

annevk
Copy link
Collaborator

@annevk annevk commented Jan 15, 2020

This needs #1587 to land first and then I'll regenerate. It would also be better if Infra's tracking vector definition was indexed so no warnings are generated.

@annevk
Copy link
Collaborator Author

annevk commented Jan 15, 2020

I guess we can also close #964 as part of landing this.

@annevk annevk force-pushed the annevk/tracking-vector-docs branch from 9a07970 to cb95c65 Compare January 17, 2020 08:10
@annevk annevk marked this pull request as ready for review January 17, 2020 08:10
@annevk annevk requested a review from tabatkins January 17, 2020 08:10
Copy link
Collaborator

@tabatkins tabatkins left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Approved after the requested addition

docs/index.bs Outdated Show resolved Hide resolved
@annevk
Copy link
Collaborator Author

annevk commented Jan 17, 2020

Done. You don't use squash and merge by the way?

@tabatkins tabatkins merged commit f4aea3b into master Jan 17, 2020
@tabatkins
Copy link
Collaborator

I prefer linear history when I can, and for some reason they don't offer a squash-and-rebase option

@annevk
Copy link
Collaborator Author

annevk commented Jan 17, 2020

That's what squash and merge does.

@annevk
Copy link
Collaborator Author

annevk commented Jan 17, 2020

(At the WHATWG we also really like linear history.)

@annevk annevk deleted the annevk/tracking-vector-docs branch January 17, 2020 15:59
@tabatkins
Copy link
Collaborator

That's what squash and merge does.

Wait, really? Then why do they call it "squash and merge"???

/me goes to look at documentation

@tabatkins
Copy link
Collaborator

Well gosh dang it, indeed it does. It specifically enforces a fast-forward commit, which effectively rebases.

Okay, I'm changing the settings then, dang.

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.

2 participants