search

AlexTelon / FlexiCharge-Org

FlexiCharge Organization repo
3 stars 45 forks source link

Sprint 1 Goals #82

Closed GabrielAdward closed 1 year ago

Lillenooben commented 1 year ago

@AlexTelon The comparison in "Files Changed" does not line up with the actual file updated with another squads squad goals. So Im not sure how this merge will end up. Also I see now that you have requested a review from Bruce but I already merged another one of these squad goals into the initial one.

AlexTelon commented 1 year ago

Oh there should be no issue to merge this. Gabriel needs to update on his end but its an small change to ensure that his teams table is added at the end applied on top of the changes you approved in the other PR.

AlexTelon commented 1 year ago

Maybe I will just leave these alone. But sometime I get private messages asking me to review these at which point it it's not for me to review them I assign to someone else. Bruce or you I don't particularly care about :)

GabrielAdward commented 1 year ago

Resolved the conflict!