From the course: Dreamweaver: Working with Git Version Control

Unlock the full course today

Join today to access over 22,400 courses taught by industry experts or purchase this course individually.

Resolving conflicts

Resolving conflicts - Dreamweaver Tutorial

From the course: Dreamweaver: Working with Git Version Control

Start my 1-month free trial

Resolving conflicts

- I've now got two sites in Dreamweaver with local Git repositories tracking the remote repository that I created on GitHub. I've done this to simulate the scenario where two members of the team work on the same file and make changes that result in a conflict when they try to push it to the remote repository. I'm currently in the clone site and this is the version of index.html in the master branch. I'm going to edit the heading here. Let's get rid of version 2, and then make it "A City of Great Contrast". Save that, stage the change, and commit it. It tells me here that I got one push to make so lets push that to the remote repository. I want to push it to the current tracking branch which is origin master. I'm going to use the default push and I don't need to fill out the username and password because my credentials are managed elsewhere. So I just click okay. That's running it there, and it says it successfully pushed it was a fast forward so it was a very simple merge that it did…

Contents