search

swe574-spring23 / SWE574

BOUN Spring 574 Project
MIT License
0 stars 0 forks source link

DEV |Space feed page - Frontend #86

Closed MariaAsif135 closed 12 months ago

MariaAsif135 commented 1 year ago

Description

html page has been created for the space feed page.

ceydaduzgec commented 1 year ago

You need to resolve conflicts before merging it to the dev. If you don't know how to do it I can help you with that.

cemrekut commented 1 year ago

You need to resolve conflicts before merging it to the dev. If you don't know how to do it I can help you with that.

hi Ceyda, it would be great, generally the system gives this error.

ceydaduzgec commented 1 year ago

Hey, could you first watch this: https://www.youtube.com/watch?v=mOJazBNrG-c The most important part is to decide which version should be the current one. For the next branch you are creating make sure that I is created from devand once in a while do git merge origin/dev to make sure your branch is up to date. If you have questions after the video we can go over it tomorrow at the class time.