How are we moving updates from dev into main without messing up the main in the process?

[Zach-Attach]

I wasn't sure if this was a question to ask over email or here, but I'd thought I'd kick things off in the discussion by actually using it.

I noticed that the main code and the dev code work differently, given that main is for the pip package. How do you move the updates from dev into main without messing everything up? Such as how the setup.py is only in main and requirements.txt is only in dev, etc.

[desaibhargav]

Hi @Zach-Attach, thanks for bringing this up and starting off the discussions!

Your last commits to the dev branch to align dev to main also added the history commits of the main to dev, and so directories such as analysis and simulation were also added along with the requirements.txt. I'm addressing that issue right now. After my latest commits you should be able to see the two branches aligned in code.

Going forward, the workflow would look like:

1. New branch for each feature or fix
2. PR to merge it into dev
3. PR to merge it into main

[Zach-Attach]

More specifically, what I was wondering is how do we transition from dev into main if there was these inconsistencies such as with analysis and simulation. After your changes, will it be possible to merge dev into main and the result will be dev and main looking identical at that moment in time?

[desaibhargav]

Yes, that's the idea.

[desaibhargav]

Update:

dev and main were locked in a commit cycle, any changes to the dev branch to align it with main would push dev "ahead" of main, and vice-versa.

Instead of generating a bunch of PRs to resolve this, I've created the develop branch from main. This resolves the issue, albeit forcefully. We can delete the dev branch now, and then later rename develop to dev.

[desaibhargav]

develop and main are now aligned. I've made a commit to the develop branch that adds the .analyze() method I've been working on. It is still under development, I should have a PR out by the end of the day. This will resolve issues related to analysis.

[desaibhargav]

@Zach-Attach you should also open PRs for develop, deleting dev would have automatically closed down your PRs I assume.

[desaibhargav]

the new develop branch (now renamed to dev) with a workflow for moving commits from dev to main supported with appropriate branch protection rules has been established.

Please feel to reopen if not @Zach-Attach