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 start of ORM considerations #2668

Merged
merged 16 commits into from
Sep 22, 2020
Merged

Add start of ORM considerations #2668

merged 16 commits into from
Sep 22, 2020

Conversation

Rick-Anderson
Copy link
Contributor

@Rick-Anderson Rick-Anderson commented Sep 18, 2020

First pass at #2106

Internal review URL

Apply MS style guide such as split up long sentences, use "For more information", ect.

Linking to the ## EF ORM considerations section will be beneficial to EF docs in other repositories.

@Rick-Anderson Rick-Anderson marked this pull request as ready for review September 18, 2020 23:03
Copy link
Member

@AndriySvyryd AndriySvyryd left a comment

Choose a reason for hiding this comment

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

🖊️

Rick-Anderson and others added 2 commits September 18, 2020 17:35
Co-authored-by: Andriy Svyryd <AndriySvyryd@users.noreply.github.com>
Co-authored-by: Shay Rojansky <roji@roji.org>
ms.date: 10/27/2016
description: General introductory overview of Entity Framework Core
author: ajcvickers
ms.date: 9/20/2020
uid: core/index
---

# Entity Framework Core

Entity Framework (EF) Core is a lightweight, extensible, [open source](https://github.com/aspnet/EntityFrameworkCore) and cross-platform version of the popular Entity Framework data access technology.
Copy link
Contributor

Choose a reason for hiding this comment

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

wrong url!

Copy link
Member

Choose a reason for hiding this comment

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

It still redirects

@JonPSmith
Copy link

Is there a link to the finished ORM considerations document? I would like to link to it in my book.

@AndriySvyryd
Copy link
Member

@JonPSmith It will be at https://docs.microsoft.com/ef/core/ when this is published.

@Rick-Anderson
Copy link
Contributor Author

@JonPSmith It will be at https://docs.microsoft.com/ef/core/ when this is published.

Can we merge to live now so it will be published?

@smitpatel
Copy link
Member

@roji - Please squash commits when merging to master in future.

@roji
Copy link
Member

roji commented Sep 23, 2020

@ajcvickers @bricelam can we just force squashing on this repo like we do on the product repo?

@ajcvickers
Copy link
Member

@roji Done.
image

@roji
Copy link
Member

roji commented Sep 23, 2020

Thanks... Frankly, I wonder why it's not possible to just configure the default merge strategy, instead of having to disallow the others. All that is good excuses why we have 16 more commits in our repo history and it's not my fault
.

@Rick-Anderson
Copy link
Contributor Author

@ajcvickers does that allow merge commits from master to live?

The https://github.com/dotnet/AspNetCore.Docs repo requires merge commits to live.

A default setting would be best. I could open a suggestion at GitHub.

@Rick-Anderson
Copy link
Contributor Author

We find this beneficial

image

@ajcvickers
Copy link
Member

@smitpatel Thoughts on allowed commit settings?

@roji
Copy link
Member

roji commented Sep 23, 2020

I use "automatically delete head branches" in all my repos - I think we discussed enabling this before, but maybe never did. Any objections to doing this?

@smitpatel
Copy link
Member

We can disable merge commits. Master to live requires merge commit but it is once every 2 week and generally not part of regular work-flow. I can deal with it via command line.

Auto delete those branches after merge. In EF Core we have msft bot doing that. In docs, I generally trim it down. Automation would be useful.

@roji
Copy link
Member

roji commented Sep 23, 2020

In EF Core we have msft bot doing that

Should we disable the bot in the product repo now that it's a github-native feature?

@Rick-Anderson
Copy link
Contributor Author

Master to live requires merge commit but it is once every 2 week and generally not part of regular work-flow.

We do merge to live almost every day. We like to keep the published content fresh.

@Rick-Anderson
Copy link
Contributor Author

Rick-Anderson commented Sep 23, 2020

just configure the default merge strategy.

I opened a feature request on GitHub

@Rick-Anderson
Copy link
Contributor Author

GitHub response

Hi Rick,

Thanks for writing in.

To clarify, what you’d like to see is either a specific merge method pre-selected or restricted which is configurable at the branch level to ensure the desired merge method is used based on the target branch? Eliminating the possibility of selecting a non-desired merge method? Given your use case, when merging pull requests to the master branch, you'd like to set the Squash and merge option set as the default behavior, and similarly, you'd like to select the Merge pull request option for pull requests to the live branch.

If so, we do have an internal issue tracking similar feedback from customers requesting this functionality and I’d like to add your input to that discussion, please let me know if my understanding of your request is correct.

Thanks,
Stacie

@roji
Copy link
Member

roji commented Sep 25, 2020

At least my perspective, there's no real need for this to be branch-specific - just a default merge strategy for the repo, much like it's already possible to disable merge strategies.

In other words, I'd like to be able to make squashing the default strategy without disabling it.

@Rick-Anderson
Copy link
Contributor Author

@roji that's what I suggested originally. I did update our suggestion:

Hi Stacie,
This from our team

There's no real need for this to be branch-specific - just a default merge strategy for the repo, much like it's already possible to disable merge strategies.

In other words, I'd like to be able to make squashing the default strategy without disabling other options.

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.

8 participants