CADELmx / GPD_BACKEND

This is a NESTjs project that implements the GPD project's backend logic
MIT License
1 stars 0 forks source link

Hot Fix: inconsistency of changes since last merge conflicts resolution #25

Closed DiegoSHS closed 2 months ago

DiegoSHS commented 2 months ago

Overview

This pull request fixes some errors in the name of methods used in the subjects service and updated the Get route in the subjects controller.

Details

Hot Fix

Some changes were lost in the last merge conflict resolution Example of the inconsistency showed in the code base:

<<<<<<< feature/subjects
    if (await this.foreign.validate())
=======
    if (await this.foreign.validateError())
>>>>>>> dev

Notice that this.foreign.validateError() doesn't exist and is currently in the dev branch

Right now, the merge conflicts are resolved, only need a check to be sure of what changes are being accepted

Note: the second statement was a non-updated change but it was merged together with the other changes

github-actions[bot] commented 2 months ago

Dependency Review

✅ No vulnerabilities or license issues or OpenSSF Scorecard issues found.

OpenSSF Scorecard

PackageVersionScoreDetails

Scanned Manifest Files