GithubHelp home page GithubHelp logo

Comments (6)

shreddd avatar shreddd commented on July 21, 2024 2

OK - for now - avoid deleting branches until this is fixed, in case something needs to be restored. This seems ok as an overall plan.

from nmdc-schema.

eecavanna avatar eecavanna commented on July 21, 2024

In other words, I think the branch renaming solution would have worked; but I accidentally used the wrong branch as the new main branch. 🤦

CC: @aclum

from nmdc-schema.

turbomam avatar turbomam commented on July 21, 2024

The nmdc-schema main branch commit history is now free of the delete operations that would have ruined berkeley-schema-fy24

The berkeley-schema-fy24 GH code page shows that it is ~ 1170 commits ahead and 0 commits behind nmdc-schema

from nmdc-schema.

eecavanna avatar eecavanna commented on July 21, 2024

This is done. Closing.

from nmdc-schema.

turbomam avatar turbomam commented on July 21, 2024

@eecavanna @shreddd when will you be comfortable deleting the temporary branches?

from nmdc-schema.

eecavanna avatar eecavanna commented on July 21, 2024

I'm already comfortable with them being deleted now, based on the validation we did over Zoom this morning.

I'll be even more comfortable (more comfortable than necessary, from my perspective) at the end of the sprint (i.e. in ~10 calendar days). The hypothetical scenario I think would be simplified for us if we were to wait until then is:

  • Someone created a feature branch from the main branch (while the main branch was in one of its temporary, problematic states in which it had 1000+ accidental commits on it). Then, that person makes a handful of commits on that feature branch. Finally, that person pushes the feature branch up to GitHub and opens a PR.
  • The PR shows 1000+ commits (plus the handful that person actually made)

I think if we have copies of those temporary branches around (which we currently do—they are named main-old and main-old-2), it will be easier for us to make sense of that PR.

I like using the end of the sprint as the milestone here because that is a milestone shared by some developers (e.g. they might open a PR for whatever they're currently working on "by then").

from nmdc-schema.

Related Issues (20)

Recommend Projects

  • React photo React

    A declarative, efficient, and flexible JavaScript library for building user interfaces.

  • Vue.js photo Vue.js

    🖖 Vue.js is a progressive, incrementally-adoptable JavaScript framework for building UI on the web.

  • Typescript photo Typescript

    TypeScript is a superset of JavaScript that compiles to clean JavaScript output.

  • TensorFlow photo TensorFlow

    An Open Source Machine Learning Framework for Everyone

  • Django photo Django

    The Web framework for perfectionists with deadlines.

  • D3 photo D3

    Bring data to life with SVG, Canvas and HTML. 📊📈🎉

Recommend Topics

  • javascript

    JavaScript (JS) is a lightweight interpreted programming language with first-class functions.

  • web

    Some thing interesting about web. New door for the world.

  • server

    A server is a program made to process requests and deliver data to clients.

  • Machine learning

    Machine learning is a way of modeling and interpreting data that allows a piece of software to respond intelligently.

  • Game

    Some thing interesting about game, make everyone happy.

Recommend Org

  • Facebook photo Facebook

    We are working to build community through open source technology. NB: members must have two-factor auth.

  • Microsoft photo Microsoft

    Open source projects and samples from Microsoft.

  • Google photo Google

    Google ❤️ Open Source for everyone.

  • D3 photo D3

    Data-Driven Documents codes.