Git for Beginners | Part 2 | Merge Conflicts
In this tutorial, I'll show you how to resolve merge conflicts in git!
I'll be using Godot for this walkthrough, but all these methods will work with other programs and game engines as well.
(part 2 in the `Git for Beginners` tutorial series)
If you noticed something I've missed in this tutorial, please leave a comment to share it with the community! :)
-----------------------------
LINKS:
Part 1: • Git for Beginners | Part 1 | Getting started
Join our discord here!: / discord
-----------------------------
Thanks for watching!
-----------------------------
If you'd like to support my work, you can follow me on Social Media or buy me a coffee! :)
https://www.buymeacoffee.com/Queble
Instagram: @queble_game_dev
Twitter: @Queble__Games
YouTube: ... :O
-----------------------------