msd-d / PetHub

An app for animal adoption.
1 stars 0 forks source link

Add cardList #53

Closed kepet19 closed 2 years ago

kepet19 commented 2 years ago
Joergenson commented 2 years ago

Also I get merge conflicts when pulling

Joergenson commented 2 years ago

Also I get merge conflicts when pulling

It is saying I have local commits to push in your name 🧇

kepet19 commented 2 years ago

Also I get merge conflicts when pulling

It is saying I have local commits to push in your name waffle

yeah it is because of rebase, Whoops :b you can either delete the branch or git reset origin/main. you can't right now, I will have to solve the conflict again with main :b

Joergenson commented 2 years ago

Also I get merge conflicts when pulling

It is saying I have local commits to push in your name waffle

yeah it is because of rebase, Whoops :b you can either delete the branch or git reset origin/main. you can't right now, I will have to solve the conflict again with main :b

Nice works now. Give me 5 min to fix issues