Configure $ git config --global -l

filter.lfs.clean=git-lfs clean %f
filter.lfs.smudge=git-lfs smudge %f
git config --global push.default simple
core.editor=atom --wait

Install Xcode and xcode command line tools Install Xcode extensions: $ xcode-select --install

Fixup Bisect Squash

Take existing Git repo and add Heroku remote repo

heroku git:remote -a app-name

Rebase branch

$ git pull --rebase origin master

Resolve conflicts

$ git mergetool

After all conflicts are resolved, clean up those .orig files

$ git clean -f

Then continue rebasing, and repeat as necessary

git rebase --continue

Once rebasing is finished and you’ve tested the app, force-sync your rebased branch

$ git push -f

If the branch exists on any other computer, you will need to overwrite the local copy of that branch with the new one you force-pushed to origin.

#On other computers:
$ git reset --hard origin/branch-name