search

open-make / openmakewebsite

hugo website for the project outreach
https://openmake.netlify.app/
0 stars 5 forks source link

Addphotos #9

Closed jcolomb closed 2 years ago

jcolomb commented 2 years ago

add photos to dev branch

MoritzMaxeiner commented 2 years ago

I'm confused. Why are you merging your changes into my personal development branch? That's how you produce conflicts.

The way it's usually done: dev/feature branches: Everyone has their own, doing their work on them. main/master branch: This is the one that gets merged into from the dev/feature branches.