kmuthuvel@BOUN03VMA15(162.218.138.83)|/data/kmuthuvel/code|2017-05-12 14:10:45{kmuth-hot-fix} $git rebase -pi development Refusing to squash a merge: 7daa8381fc40294b9616ebe28466a0cc2aabdca3 -bash: [: too many arguments 1 ✗ failed O_O ________________________________________________________________________________ kmuthuvel@BOUN03VMA15(162.218.138.83)|/data/kmuthuvel/code|2017-05-12 14:11:29{(no branch, rebasing kmuth-hot-fix)} $gs rebase in progress; onto 3f688ad You are currently editing a commit while rebasing branch 'kmuth-hot-fix' on '3f688ad'. (use "git commit --amend" to amend the current commit) (use "git rebase --continue" once you are satisfied with your changes) nothing to commit (use -u to show untracked files) -bash: [: too many arguments 0 ✓ success ^_^ ________________________________________________________________________________ kmuthuvel@BOUN03VMA15(162.218.138.83)|/data/kmuthuvel/code|2017-05-12 14:11:50{(no branch, rebasing kmuth-hot-fix)} $git rebase -pi development 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 "/data/kmuthuvel/code/.git/rebase-merge" and run me again. I am stopping in case you still have something valuable there. -bash: [: too many arguments 1 ✗ failed O_O ________________________________________________________________________________ kmuthuvel@BOUN03VMA15(162.218.138.83)|/data/kmuthuvel/code|2017-05-12 14:13:09{(no branch, rebasing kmuth-hot-fix)} $git rebase --continue cat: /data/kmuthuvel/code/.git/rebase-merge/stopped-sha: No such file or directory [detached HEAD 80e6fed] comparing tdsp , using internal name 2 files changed, 37 insertions(+) Successfully rebased and updated refs/heads/kmuth-hot-fix. 0 ✓ success ^_^ ________________________________________________________________________________ kmuthuvel@BOUN03VMA15(162.218.138.83)|/data/kmuthuvel/code|2017-05-12 14:13:54{kmuth-hot-fix} $git push -f origin kmuth-hot-fix Counting objects: 2, done. Delta compression using up to 8 threads. Compressing objects: 100% (2/2), done. Writing objects: 100% (2/2), 280 bytes | 0 bytes/s, done. Total 2 (delta 1), reused 0 (delta 0) remote: remote: View merge request for kmuth-hot-fix: remote: https://de-gitlab.engine.host/fireengine/code/merge_requests/3377 remote: To git@de-gitlab.engine.host:fireengine/code.git + 21064c0...80e6fed kmuth-hot-fix -> kmuth-hot-fix (forced update) 0 ✓ success ^_^ ________________________________________________________________________________ kmuthuvel@BOUN03VMA15(162.218.138.83)|/data/kmuthuvel/code|2017-05-12 14:14:20{kmuth-hot-fix}