Create a branch

Create a parallel branch

git checkout -b feature

Replace the contents and commit

echo "some content from feature" > code.txt

Notice single > operator A >> would have added this new content to the next line, which would not result in any conflict later!

cat code.txt

git commit -am "modification in feature"