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 back the history of master into main #1061

Merged
merged 2,203 commits into from Jul 21, 2021
Merged

Add back the history of master into main #1061

merged 2,203 commits into from Jul 21, 2021

Conversation

benchislett
Copy link
Contributor

@benchislett benchislett commented Jul 18, 2021

🚀 🚀 Pull Request

Checklist:

  • My code follows the style guidelines of this project and the Contributing document
  • I have commented my code, particularly in hard-to-understand areas
  • I have kept the coverage-rate up
  • I have performed a self-review of my own code and resolved any problems
  • I have checked to ensure there aren't any other open Pull Requests for the same change
  • I have described and made corresponding changes to the relevant documentation
  • New and existing unit tests pass locally with my changes

Changes

This PR adds back the entire history of old hub, effectively making main no longer an orphan branch. Note that github may not visually display all commits, and that the net file diff is zero.

The relevant commits to this PR are:

  • 6a263b5 to wipe all the master files
  • 75ccaa2 to sync the branch with main.

This branch was created by the following steps:

  • git checkout master
  • git checkout -b old_master_new_main: Checkout a new branch based off master
  • git rm -rf *: Remove all tracked files from master
  • git merge main --allow-unrelated-histories: Add all the changes from main, despite the fact that it is an orphan branch

I am unaware of any other method that would de-orphan the branch and include the history in this way. A clever rebase may also work, but I believe it would produce an equivalent result.

haiyangdeperci and others added 30 commits March 21, 2021 21:07
Bumps [tiledb](https://github.com/TileDB-Inc/TileDB-Py) from 0.7.6 to 0.8.5.
- [Release notes](https://github.com/TileDB-Inc/TileDB-Py/releases)
- [Changelog](https://github.com/TileDB-Inc/TileDB-Py/blob/dev/HISTORY.md)
- [Commits](TileDB-Inc/TileDB-Py@0.7.6...0.8.5)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Bumps [tensorflow](https://github.com/tensorflow/tensorflow) from 2.4.0 to 2.4.1.
- [Release notes](https://github.com/tensorflow/tensorflow/releases)
- [Changelog](https://github.com/tensorflow/tensorflow/blob/master/RELEASE.md)
- [Commits](tensorflow/tensorflow@v2.4.0...v2.4.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Bumps [sphinx](https://github.com/sphinx-doc/sphinx) from 3.5.2 to 3.5.3.
- [Release notes](https://github.com/sphinx-doc/sphinx/releases)
- [Changelog](https://github.com/sphinx-doc/sphinx/blob/3.x/CHANGES)
- [Commits](https://github.com/sphinx-doc/sphinx/commits)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
…-be-avoided

avoided mutable  default args in client/base.py
Feature/auto [infer-schema & auto-directory ingestion]
….4.1

Bump tensorflow from 2.4.0 to 2.4.1
* Create README_RU.md

Create russian translation for README

* Update README with link to russian translation

* Add russian usage tracking translation

* Updated links for russian translation
Removed version information in setup.py
Revert "Removed version information in setup.py"
@activeloop-cla
Copy link

Thanks for making Hub better! Before we can merge your Pull Request, we'd need you to sign our Contributor License Agreement. A CLA enables us to safely commercialize our products while keeping a Hub free and open source. More about why we need you to sign a CLA and a human-friendly summary is accessible here. You may view the full legal CLA document here.

@benchislett benchislett changed the title Old master new main Add back the history of master into main Jul 18, 2021
@codecov
Copy link

codecov bot commented Jul 18, 2021

Codecov Report

Merging #1061 (75ccaa2) into main (49e6767) will not change coverage.
The diff coverage is n/a.

Impacted file tree graph

@@           Coverage Diff           @@
##             main    #1061   +/-   ##
=======================================
  Coverage   89.77%   89.77%           
=======================================
  Files          94       94           
  Lines        4178     4178           
=======================================
  Hits         3751     3751           
  Misses        427      427           

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 49e6767...75ccaa2. Read the comment docs.

@verbose-void verbose-void merged commit bffb083 into main Jul 21, 2021
@verbose-void verbose-void deleted the old_master_new_main branch July 21, 2021 18:58
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet