From the course: Robot Framework Test Automation: Jenkins CI and Git Version Control
Join today to access over 22,600 courses taught by industry experts.
Handling merge conflicts
From the course: Robot Framework Test Automation: Jenkins CI and Git Version Control
Handling merge conflicts
- So now let's see what it looks like if two different team members make a change to the same line of the same file and they both try to push that up to the remote repository. So, on the local repository here, I'll go to this first test case here and I'm going to delete this Products tag here and I'll go ahead and I'll commit those changes and I'll call it my third change and again I'm just going to commit, because I don't want to accidentally overwrite somebody else's changes by doing a commit and push. So, now again, I'll pretend to be a different user by jumping in here to the website, clicking on tests, and on Amazon dot robot, I'm going to modify the same file by clicking the pencil button here and on this first test case here, I'm going to change this second tag to Search and I'll scroll to the bottom and I'll commit directly to the master branch by clicking this commit changes button. So, that symbolizes a different user changing the exact same line that I just changed on my…
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.