git-rebase:tldr:a26ec

git-rebase: Continue a rebase that was interrupted by a merge failure, after editing conflicting files.

$ git rebase --continue

try on your machine

The command git rebase --continue is used in Git to continue the process of rebasing after resolving a conflict.

When you run git rebase, it is possible to encounter conflicts when Git tries to apply the changes from the upstream branch onto your current branch. Conflicts occur when there are conflicting changes on the same lines of a file.

To resolve these conflicts, you need to manually edit the conflicting files to merge the conflicting changes. After making the necessary changes, you need to stage the modified files using git add to mark them as resolved.

Once you have resolved all the conflicts in a particular commit, you can run git rebase --continue to continue the rebasing process. This command tells Git that you have successfully resolved the conflicts and allows it to proceed to the next commit. If there are additional conflicts in subsequent commits, Git will pause and prompt you to resolve them one by one.

It's important to note that git rebase --continue should only be used after resolving conflicts. If you need to abort the rebase process, you can use git rebase --abort.

This explanation was created by an AI. In most cases those are correct. But please always be careful and never run a command you are not sure if it is safe.

back to the git tool