# Rebase in progress. Cannot commit. How to proceed
**URL:** https://talk.openmrs.org/t/rebase-in-progress-cannot-commit-how-to-proceed/30756
**Category:** Development
**Tags:** developers-forum
**Created:** [October 30, 2020, 6:19am UTC](https://talk.openmrs.org/t/rebase-in-progress-cannot-commit-how-to-proceed/30756 "2020-10-30T06:19:16Z")
**Posts on this page:** 5
**Page:** 1
### Author:  [@kdaud](https://talk.openmrs.org/u/kdaud)
#### Post date: [October 30, 2020, 6:19am UTC](https://talk.openmrs.org/t/rebase-in-progress-cannot-commit-how-to-proceed/30756/1 "2020-10-30T06:19:16Z")
I’m stuck 😷. I don’t know what to do? Does it really take this long to rebase? `git rebase --continue` doesn’t do anything. I don’t have anything in git status… I’m just waiting for the rebase. Here is the output
`No commands done.
Next commands to do (3 remaining commands):
pick d4cb07a4 RESTWS-802:Collapsible if statements should be merged (#465)
squash b25eab57 RESTWS-798:Parameterized messages should be used for logging (#466)
(use “git rebase --edit-todo” to view and edit)
You are currently editing a commit while rebasing branch ‘RESTWS-795’ on ‘55692106’.
(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
`
What can I do?
---
### Author:  [@herbert24](https://talk.openmrs.org/u/herbert24)
#### Post date: [October 30, 2020, 6:28am UTC](https://talk.openmrs.org/t/rebase-in-progress-cannot-commit-how-to-proceed/30756/2 "2020-10-30T06:28:25Z")
> [@kdaud](#):
>
> (use “git rebase --edit-todo” to view and edit) You are currently editing a commit while rebasing branch ‘RESTWS-795’ on ‘55692106’. (use “git commit --amend” to amend the current commit) (use “git rebase --continue” once you are satisfied with your changes)
Do any of these lines apply to what you are doing,if so apply the recommended command
---
### Author:  [@kdaud](https://talk.openmrs.org/u/kdaud)
#### Post date: [October 30, 2020, 6:42am UTC](https://talk.openmrs.org/t/rebase-in-progress-cannot-commit-how-to-proceed/30756/3 "2020-10-30T06:42:06Z")
Actually am squashing my commits to become one But things are not working out even when i run
`git rebase --continue`
---
### Author:  [@jwnasambu](https://talk.openmrs.org/u/jwnasambu)
#### Post date: [October 30, 2020, 12:40pm UTC](https://talk.openmrs.org/t/rebase-in-progress-cannot-commit-how-to-proceed/30756/4 "2020-10-30T12:40:17Z")
@kdaud you are having two processes running concurrently basing on what am seeing on the logs. What if you first amend the commit by running `git commit --amend` then run `git rebase --continue` to proceed with squashing? Alternatively run `git rebase --abort` to to completely undo the rebase and begin the process a fresh.
---
### Author:  [@kdaud](https://talk.openmrs.org/u/kdaud)
#### Post date: [October 30, 2020, 1:43pm UTC](https://talk.openmrs.org/t/rebase-in-progress-cannot-commit-how-to-proceed/30756/5 "2020-10-30T13:43:09Z")
`git rebase --abort` helped out. 💕