search

focallocal / fl-maps

The Public Happiness Movement: A platform bringing people and communities together to solve any and all societal issues. BTM branch is a project aiming to solve world involuntary homelessness. PHM brings communities together to create social initiatives for kindness and well-being.
https://publichappinessmovement.com
MIT License
143 stars 95 forks source link

colour code edit #1195

Closed AndyatFocallocal closed 11 months ago

AndyatFocallocal commented 12 months ago

@Marvelxy Something going wrong here. I'm merging branch Andy2 into Deploy-PHM.

In Deploy-PHM there is no folder called EventsSection here: https://github.com/focallocal/fl-maps/tree/deploy-phm/imports/client/ui/pages/Home

In Andy2 there is: https://github.com/focallocal/fl-maps/tree/Andy2/imports/client/ui/pages/Home

If i compare them i don't see that folder at all: https://github.com/focallocal/fl-maps/compare/deploy-phm...Andy2

When i merge them its not merging that folder. Can you see why?

Marvelxy commented 11 months ago

In that case, we should update Deploy-PHM to the latest code base version before you do your merge request. What branch do you think has the most recent code?

AndyatFocallocal commented 11 months ago

This one, if it works

AndyatFocallocal commented 11 months ago

(Andy2)

AndyatFocallocal commented 11 months ago

which i'd like to merge with deploy-phm but am having some issues. I'll try again now.