search

citi-onboarding / Pratas-onepage

0 stars 0 forks source link

Footer session #26

Closed isaquetdiniz closed 4 years ago

isaquetdiniz commented 4 years ago

Finished Footer Session Responsive

debespindola commented 4 years ago

Hey, great job. Only few things to change. I checked the responsivity and the elements don't work well in some screens. I would say I could use % our rem instead of px, because it's more likely to work in different screens.

isaquetdiniz commented 4 years ago

i fixed that in Contact Session, think :)

debespindola commented 4 years ago

It's perfect, but I could't merge because it's conflicting. Try to do this: git checkout develop git checkout footerSession git rebase delevop

~then you solve the conflicts on vscode

git add . git rebase --continue

~keep solving and doing the last 2 commands till there's no more conflics

git add . git commit -m "" git push -f footerSession

to cancel the rebase use: git rebase --abort