cannot push

[giffiecode]

lambda-server:~/containers (avltree|REBASE-i 1/1) $ git reset lambda-server:~/containers (avltree|REBASE-i 1/1) $ git add containers/AVLTree.py lambda-server:~/containers (avltree|REBASE-i 1/1) $ git commit -m "hey" interactive rebase in progress; onto 64a5bd9 Last command done (1 command done): pick 3b6291b try No commands remaining. You are currently editing a commit while rebasing branch 'avltree' on '64a5bd9'. (use "git commit --amend" to amend the current commit) (use "git rebase --continue" once you are satisfied with your changes)

nothing to commit, working tree clean lambda-server:~/containers (avltree|REBASE-i 1/1) $

somehow my avltree has this end and I cannot push

[giffiecode]

Hi Mike, After several attempts of pushing and reading many resources, I still couldn't get the push going. I was trying so hard that I even used github to edit file, and only realize afterwards that that's not allowed in the class. Now, I can't really find ways to rollback that move. I had no intention of using the github editor and have never used it before. Since I couldn't figure out how to push after many many attempts, that was one of the attempt out of lack of other viable things to try. After edited I felt weird and immediately want to undo that. I haven't submitted anything to to sakai.

Could you kindly help me to resolve this issue?

[mikeizbicki]

For the purposes of this class, rebasing is always the wrong thing to do. You can undo your rebase with the command

$ git rebase --abort

I assume that the rebase was started when you ran the git pull command. Somehow a handful of students have gotten git configured to use rebase automatically instead of merge in this command. You can disable this behavior by adding the --rebase=false parameter to the git pull command that you run.