search

aspnet / WebHooks

[Archived] Libraries to create and consume web hooks on ASP.NET Core. Project moved to https://github.com/aspnet/AspLabs
Apache License 2.0
627 stars 439 forks source link

Use ASP.NET Core branching strategy #166

Closed dougbu closed 7 years ago

dougbu commented 7 years ago

@Eilon the dev branch in this repo was previously ahead of master by six commits. Both were ahead of the 1.2.1-rtm tag though just by one commit in master's case. In any case, the history was very linear and that's no longer the case because PR #158 (922798f6) merged into master but not dev.

Should I merge / cherry-pick this commit / whatever to again place dev ahead of master?

Or, would you prefer I bring the newer commits over from dev to master, then kill the dev branch (with fire)? I suggest we don't need to have both dev and master, given the well-kept tags for older releases.

Eilon commented 7 years ago

We should do what we do everywhere in ASP.NET Core: dev is the newest branch, and we'll create branches for stabilization, and tags for releases.

dougbu commented 7 years ago

@Eilon I've merged master into dev. Please set dev to be the repo's default branch. Then, I'll delete master and this issue can be 3 - Done.

Eilon commented 7 years ago

Ok dev is now the default branch. Please take this into account regarding any open PRs (because they'd all be on the wrong branch now).

dougbu commented 7 years ago

master is no more and all PRs are focused on dev.