Skip to content
This repository was archived by the owner on Jun 1, 2024. It is now read-only.

Conversation

hernandazevedozup
Copy link
Contributor

@hernandazevedozup hernandazevedozup commented Jan 27, 2022

Description

This pull request brings all the work from the team Orange - UX Services - Beagle Open Core to the Beagle Open Source project.

Differently than most other projects, the Orange version of this was not a fork, which made this merge very hard. I tried to rebase it and to cherry pick the commits, nothing worked, there always was something missing at the end. To make sure everything from Beagle-Orange was coming, I chose the "nuclear" option, I copied the changes manually.

This is a single commit made by myself, but i'm only responsible for the merge. The actual authors of this code are: @uziasferreirazup, @hernandazevedo.

I checked it, everything but the following files are exactly the same as the version in the Orange repo:

  • .github/*
  • CODEOWNERS
  • README.md

If any important change was made to these files in the orange repo, they were lost. Can you confirm there was nothing important there @hernandazevedozup? I think we should keep these files as they are in the open source version.

Tasks for merging this into the main branch:

  • Merge the main into this (cherry picking the relevant commits)
  • Verify if the content of github/* is correct (@hernandazevedozup)

Related PRs

@github-actions
Copy link

1 Warning
⚠️ Big PR

Generated by 🚫 Danger

@hernandazevedozup hernandazevedozup force-pushed the feature/orange-open-reviewed branch from 8c141f1 to c7f2cac Compare January 27, 2022 19:20
Signed-off-by: Hernand Azevedo <[email protected]>
Signed-off-by: Hernand Azevedo <[email protected]>
@hernandazevedozup hernandazevedozup mentioned this pull request Jan 27, 2022
2 tasks
@lucasfonsecazup lucasfonsecazup merged commit ae52d35 into main Jan 31, 2022
@lucasfonsecazup lucasfonsecazup deleted the feature/orange-open-reviewed branch January 31, 2022 18:57
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants