Skip to content

Catchup merge from main into SED#27

Open
dmitrisvetlov wants to merge 798 commits into
SequentialExperimentDesignfrom
main
Open

Catchup merge from main into SED#27
dmitrisvetlov wants to merge 798 commits into
SequentialExperimentDesignfrom
main

Conversation

@dmitrisvetlov
Copy link
Copy Markdown
Collaborator

My changes on the SequentialExperimentDesign branch are intended to build upon the existing code without modifying the latter in any way, so conflicts should never arise. As this is just a "catchup" merge, and it can be automatically made, I will go ahead and approve the PR myself.

@dmitrisvetlov
Copy link
Copy Markdown
Collaborator Author

@Munsky,

There are several (trivial) conflicts that occur in trying to merge main into my branch; all of them can be resolved by simply taking the version on main, since any changes I have made to existing code (e.g. to Examples/Cook_etal_2024_Sequential_Design/) were only for testing and debugging purposes.

However, even when I resolve the conflicts, GitHub does not allow the pull request to be merged, because it tries to reverse the merge, making it from SequentialExperimentDesign into main. Do you know why this is occurring? It seems like a pretty severe GitHub bug, if that is where the fault lies.

image

If we can't resolve this, I can try to merge this via the command line, or make a fresh branch from main and simply copy-and-paste my changes over there.

- Dmitri

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.

5 participants