SpaceyaTech / Team-Berlin-React

Repository for Team Berlin

10 stars 9 forks source link

Closed NikolaGundzikova closed 1 year ago

NikolaGundzikova commented 2 years ago

Description

Fixes #36

No tests - no functions.

[ ✓ ] My code follows the style guidelines of this project
[ ✓ ] I have performed a self-review of my own code
[ ✓ ] My changes generate no new warnings
[ ✓ ] Any dependent changes have been merged and published in downstream modules

NikolaGundzikova commented 1 year ago

Include the entire .idea folder in gitignore

thank you, solved

NikolaGundzikova commented 1 year ago

Hi, I updated PR.

daveclinton commented 1 year ago

Hi, I updated PR.

Hey @NikolaGundzikova Thats good. You can do a git pull origin --rebase pre-dev to fix the conflicts you have

NikolaGundzikova commented 1 year ago

I resolved conflicts.

jumalaw98 commented 1 year ago

@NikolaGundzikova check out on this, still have some minor conflicts to tackle

NikolaGundzikova commented 1 year ago

@NikolaGundzikova check out on this, still have some minor conflicts to tackle

I don´t know why is merging blocked because I updated my branch. Everything looks good.

NikolaGundzikova commented 1 year ago

Hi, I updated PR.

Hey @NikolaGundzikova Thats good. You can do a git pull origin --rebase pre-dev to fix the conflicts you have

Can you check my change, please?