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.

Merging branches

Merging branches - Dreamweaver Tutorial

From the course: Dreamweaver: Working with Git Version Control

Start my 1-month free trial

Merging branches

- [Instructor] We've now got two branches of our website with slightly different styles and content. The new design branch uses a Serif font and has a colored heading but if I switch to the master branch, that uses a Sans Serif font and has slightly different wording in the heading. Let's make another change to the master branch. I'm going to change this image here of the guard house, select the Quick Property Inspector, and then Source, select crossing.jpg and then change the Alternate Text to Scramble Crossing. So if we save that then stage and commit, we can say that we've changed that image. So in the master branch we now have this image of the Scramble Crossing. It should be in Tokyo, a place that I crossed virtually every day when I lived in Japan and then in the other branch, the new design branch, we're still using that image of the guard house and the Imperial Palace and we've got that slightly different wording in the heading. So the content of this branch is now getting out…

Contents