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

Migrates https://github.com/DickinsonCollege/FD2School-FarmData2/pull/209 #673

Conversation

RolandLocke
Copy link
Contributor

Pull Request Description

This pull request was orignially created on FD2School-FarmData2.
Link to the original pull request: https://github.com/DickinsonCollege/FD2School-FarmData2/pull/209

Partially Addresses #662

Licensing Certification

FarmData2 is a Free Cultural Work and all accepted contributions are licensed as described in the LICENSE.md file. This requires that the contributor holds the rights to do so. By submitting this pull request I certify that I satisfy the terms of the Developer Certificate of Origin for its contents.

@RolandLocke
Copy link
Contributor Author

RolandLocke commented Jul 15, 2023

@braughtg This reported some conflicts when I cherry-picked it. Many files that didn't exist in HEAD. The commit is actually empty... So I'll leave this here for consistency and let you decide what should be done.

git cherry-pick 1a180ac720c0adee283924eea1568316129e2443

CONFLICT (modify/delete): farmdata2/farmdata2_modules/fd2_example/dbtest/dbtest.sessionToken.spec.js deleted in HEAD and modified in 1a180ac... Added cy.waitForPage() to dbtest testing examples (#209). Version 1a180ac... Added cy.waitForPage() to dbtest testing examples (#209) of farmdata2/farmdata2_modules/fd2_example/dbtest/dbtest.sessionToken.spec.js left in tree.

CONFLICT (modify/delete): farmdata2/farmdata2_modules/fd2_example/dbtest/dbtest.modify.seedings.spec.js deleted in HEAD and modified in 1a180ac... Added cy.waitForPage() to dbtest testing examples (#209). Version 1a180ac... Added cy.waitForPage() to dbtest testing examples (#209) of farmdata2/farmdata2_modules/fd2_example/dbtest/dbtest.modify.seedings.spec.js left in tree.

CONFLICT (modify/delete): farmdata2/farmdata2_modules/fd2_example/dbtest/dbtest.maps.spec.js deleted in HEAD and modified in 1a180ac... Added cy.waitForPage() to dbtest testing examples (#209). Version 1a180ac... Added cy.waitForPage() to dbtest testing examples (#209) of farmdata2/farmdata2_modules/fd2_example/dbtest/dbtest.maps.spec.js left in tree.

CONFLICT (modify/delete): farmdata2/farmdata2_modules/fd2_example/dbtest/dbtest.html deleted in HEAD and modified in 1a180ac... Added cy.waitForPage() to dbtest testing examples (#209). Version 1a180ac... Added cy.waitForPage() to dbtest testing examples (#209) of farmdata2/farmdata2_modules/fd2_example/dbtest/dbtest.html left in tree.

CONFLICT (modify/delete): farmdata2/farmdata2_modules/fd2_example/dbtest/dbtest.get.seedings.spec.js deleted in HEAD and modified in 1a180ac... Added cy.waitForPage() to dbtest testing examples (#209). Version 1a180ac... Added cy.waitForPage() to dbtest testing examples (#209) of farmdata2/farmdata2_modules/fd2_example/dbtest/dbtest.get.seedings.spec.js left in tree.

error: could not apply 1a180ac... Added cy.waitForPage() to dbtest testing examples (#209)

hint: after resolving the conflicts, mark the corrected paths

hint: with 'git add <paths>' or 'git rm <paths>'

hint: and commit the result with 'git commit'

@RolandLocke
Copy link
Contributor Author

This commit changes documents added in this commit in the FD2School Repo: Added FD2 Example sub-tab for testing with database access (#198)

@RolandLocke RolandLocke changed the title Migrates https://github.com/DickinsonCollege/FD2School-FarmData2/pull… Migrates https://github.com/DickinsonCollege/FD2School-FarmData2/pull/209 Jul 15, 2023
@braughtg
Copy link
Member

No need to migrate this one.

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.

2 participants