How to rebase

Rebase.git

//make sure you have the most up-to-date version of the branch you're rebasing on.
git checkout develop
git pull

// go back to feature branch
git checkout updated-card

//rebase!
git rebase develop

// If you get conflicts, git will tell you
git status
//Once everything is fixed, add and commit the changes 

//Then run the following so git can rebase
git rebase --continue 

//push
git push --force