Closed fangohr closed 5 months ago
changes in upstream that we don't have:
I would say its easier to push our changes upstream and then synchronise. so send two MRs upstream:
and then merge the changes back here.
I guess since Im not a maintainer of the package, I didn't get notified when there were changes to the octopus package.
After the synchronisation, we could add a CI that periodically checks for the make diff
target and post the status as a badge
There is some divergence (use
make diff
) - we should integrate changes from upstream into ourpackage.py
and then create one or more merge requests to bring our changes to upstream.Probably best to do this before we introduce additional changes.