These are chat archives for fossasia/open-event-server
(.venv)himanshi@himanshi-HP-Notebook:~/open-event-orga-server$ git rebase -i HEAD~4
It seems that there is already a rebase-merge directory, and
I wonder if you are in the middle of another rebase. If that is the
case, please try
git rebase (--continue | --abort | --skip)
If that is not the case, please
rm -fr "/home/himanshi/open-event-orga-server/.git/rebase-merge"
and run me again. I am stopping in case you still have something
git rebase --abort^^^ in case you got anything wrong
git rebase -i HEAD~numberofcommits
git push -f remote branch
numberofcommitsis the number of commits you have to squash,
remoteis your remote's name which is basically origin and
branchis the name of the branch which you want to rebase.