rebase failed

gistfile1.txt

m@pop-os:~/git/upstream-ansible/markuman-ansible$ gs
On branch devel
Your branch is up to date with 'origin/devel'.

nothing to commit, working tree clean
m@pop-os:~/git/upstream-ansible/markuman-ansible$ git remote -v
origin	https://markuman:[email protected]/markuman/ansible (fetch)
origin	https://markuman:[email protected]/markuman/ansible (push)
upstream	https://github.com/ansible/ansible.git (fetch)
upstream	https://github.com/ansible/ansible.git (push)
m@pop-os:~/git/upstream-ansible/markuman-ansible$ git pull --rebase upstream devel
From https://github.com/ansible/ansible
 * branch                  devel      -> FETCH_HEAD
First, rewinding head to replay your work on top of it...
Applying: add example how to use aws_service_ip_ranges result in ec2_group module
Applying: fix syntax error
Applying: revert documentation changes
Applying: expand documentation on how to use lookup plugin aws_service_ip_ranges with ec2_group module
Applying: fix rst syntax error
Applying: add example how to use aws_service_ip_ranges result in ec2_group module
Applying: fix syntax error
Applying: revert documentation changes
Applying: expand documentation on how to use lookup plugin aws_service_ip_ranges with ec2_group module
Using index info to reconstruct a base tree...
M	docs/docsite/rst/scenario_guides/guide_aws.rst
Falling back to patching base and 3-way merge...
Auto-merging docs/docsite/rst/scenario_guides/guide_aws.rst
CONFLICT (content): Merge conflict in docs/docsite/rst/scenario_guides/guide_aws.rst
error: Failed to merge in the changes.
Patch failed at 0009 expand documentation on how to use lookup plugin aws_service_ip_ranges with ec2_group module
hint: Use 'git am --show-current-patch' to see the failed patch

Resolve all conflicts manually, mark them as resolved with
"git add/rm <conflicted_files>", then run "git rebase --continue".
You can instead skip this commit: run "git rebase --skip".
To abort and get back to the state before "git rebase", run "git rebase --abort".

m@pop-os:~/git/upstream-ansible/markuman-ansible$ nano docs/docsite/rst/scenario_guides/guide_aws.rst
m@pop-os:~/git/upstream-ansible/markuman-ansible$ git add docs/docsite/rst/scenario_guides/guide_aws.rst
m@pop-os:~/git/upstream-ansible/markuman-ansible$ gs
rebase in progress; onto 780ee45819
You are currently rebasing branch 'devel' on '780ee45819'.
  (all conflicts fixed: run "git rebase --continue")

nothing to commit, working tree clean
m@pop-os:~/git/upstream-ansible/markuman-ansible$ git rebase --continue
Applying: expand documentation on how to use lookup plugin aws_service_ip_ranges with ec2_group module
No changes - did you forget to use 'git add'?
If there is nothing left to stage, chances are that something else
already introduced the same changes; you might want to skip this patch.

Resolve all conflicts manually, mark them as resolved with
"git add/rm <conflicted_files>", then run "git rebase --continue".
You can instead skip this commit: run "git rebase --skip".
To abort and get back to the state before "git rebase", run "git rebase --abort".

m@pop-os:~/git/upstream-ansible/markuman-ansible$