Screenshot of the commit on GitHub
Screenshot of the output of the merge command
Screenshot of the successful merge on main branch
Screenshot of the commit for utils.py Screenshot of the commit for utils_tests.py
After commiting c1 and c2 on branch rebase, and then commiting c3 and c4 on branch develop, I switched back to branch rebase and ran the following rebase command:
Then I switched back to the develop branch and ran the following rebase command:
In the log, you can now see that the order of the commits is: c3->c4->c1->c2