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

Incorporate install profile work #5

Merged
merged 38 commits into from
Dec 14, 2021
Merged

Incorporate install profile work #5

merged 38 commits into from
Dec 14, 2021

Conversation

rosiel
Copy link
Contributor

@rosiel rosiel commented Dec 13, 2021

Having merged:

We are hoping to merge the Install Profile work into the main sandbox branch, then update and merge Islandora-Devops/isle-dc#160.

@rosiel
Copy link
Contributor Author

rosiel commented Dec 13, 2021

The difference here is too much for git merge. We want to effectively stomp over the old main branch.

@rosiel
Copy link
Contributor Author

rosiel commented Dec 13, 2021

If you are confident that this belongs on the main branch, here is a proposal to:

  • avoid the stuff in main being merged into this work (even if we resolve the merge conflicts, we get a bunch of extra stuff!)
  • preserve git history (including everything in main)

I'll make a PR against main that sets its codebase back to the parent commit where this branched off from. Then this should merge cleanly.

Credit to @alxp for the clever idea

@rosiel rosiel mentioned this pull request Dec 13, 2021
@rosiel
Copy link
Contributor Author

rosiel commented Dec 13, 2021

If we merge #6 this one can be merged.

@Natkeeran Natkeeran merged commit 4012e56 into main Dec 14, 2021
@rosiel rosiel deleted the install-profile branch December 14, 2021 14:29
@rosiel rosiel restored the install-profile branch December 14, 2021 14:34
alxp pushed a commit to roblib/islandora-sandbox that referenced this pull request Aug 12, 2022
Add dependencies for Date Ranger Widget in Advanced Search
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