From the course: Source Code Control in .NET with Git Using SourceTree
Join today to access over 22,600 courses taught by industry experts or purchase this course individually.
Users change same file independently
From the course: Source Code Control in .NET with Git Using SourceTree
Users change same file independently
- [Instructor] Our merges have been nice and easy because User 1 and User 2 were working on different areas of the program. When they both work on the same area, we run into the possibility of a conflict. You'll notice that SourceTree looks a little different from the last time that we looked at it. And that's because User 1 and User 2 both added lines to Runner. There was an attempt at a merge, which failed, and so we needed to revert that merge. All of this will be explained as we go along. But let's take a look at how you can merge when there's a conflict so that you don't end up with having to roll back your changes. So we'll ask SourceTree to stand to the side for a moment and let's have User 1 make another change in this file. So User 1 is going to say Console.WriteLine and User 1 made this change. So User 1 is working along perfectly happily, making changes to the file. Unbeknownst to User 1, User 2 is also editing the same file. So we'll have User 2 come along and say Console…
Practice while you learn with exercise files
Download the files the instructor uses to teach the course. Follow along and learn by watching, listening and practicing.
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.