Rebase changes in foo.txt.
aaaaaaaa

Story-id: 68205904
Rebase -i changes.

Adding new changes.
First line

 * bullet point
 * 2nd point

Another line
Yet another line

foobar
Updating review for s68205904.

Story-id: 68205904
Merge branch 'story/some-story/68205904' into develop