# Set up a repository where feature-branch changes one line git init -q echo "<h1>Hello world!</h1>" > index.html git add index.html git commit -q -m "First release of Hello World!" git checkout -q -b feature-branch echo "<h1>Hello Git!</h1>" > index.html git commit -q -am "Change the heading" git checkout -q main git merge --no-ff feature-branch