From the course: Git Essential Training (2023)
Join today to access over 24,700 courses taught by industry experts.
Getting out of trouble
From the course: Git Essential Training (2023)
Getting out of trouble
- [Instructor] In this chapter, we'll talk a little bit about the trouble that you might get when you use Git. Git is a very flexible tool. It gives you a lot of options to work with a lot of different versions with code and it can do a lot on its own. So it can look at the code and see what option might be the one you want to keep but sometimes this goes wrong. The one we see the most often are merge conflicts. This can happen if different people are working on the same file. When they try to merge them, Git doesn't understand which version it should keep but you could have other troubles as well, like getting confused about where you are in history or maybe working on the wrong branch. Often you can still fix stuff. Let's see how we can fix a simple merge conflict. So I have my old repository and I still need to push some changes to the remote repository but by now I have also created some changes in the remote…
Download courses and learn on the go
Watch courses on your mobile device without an internet connection. Download courses using your iOS or Android LinkedIn Learning app.
