git add . git commit -m "Added index.html in method1 branch" Now this new file, index.html, exists in the method1 branch (not in the main branch). To push these changes to GitHub, we’ll execute ...

git add README.md git commit -m "Resolved merge conflict in README.md" That’s it! You’ve successfully resolved a Git merge conflict using Visual Studio Code. I hope you find this useful.

There is no differentiation between merge, branch and git commits. Colors are not used consistently. Support and bugfix branches are typically omitted. In the enhanced Gitflow workflow diagram above, ...