How to make a rebase?

git-rebase.md

First commit the changes from your local branch

git add .
git commit -m 'fix(about): something'

Switch to the branch with which you will do the rebase

git checkout {other-branch}
git pull origin {other-branch}

Switch to your local branch and performs the rebase

git checkout {local-branch}
git rebase -i origin/{other-branch}

If there are conflicts solved with git mergetool, then git add . and git rebase --continue

Returns to the branch with which you will do the rebase

git checkout {other-branch}
git merge {local-branch}

Finally, push your changes :D

git push origin {other-branch}