Skip to content

Latest commit

 

History

History
31 lines (22 loc) · 1.66 KB

ex4-solution.asciidoc

File metadata and controls

31 lines (22 loc) · 1.66 KB

Exercise 4 Solution

  1. On your local machine, edit the README file, adding this text to the bottom: …​

  2. Commit the change to your local repository, but do not commit to the remote.

    At this point you should see that your local master is ahead of the origin/master in the commit list.

  3. On GitHub, edit the README again, adding this to the bottom: …​

  4. Commit the change on GitHub.

  5. In SourceTree, fetch remote changes by pressing the fetch button, Fetch button, and clicking OK. Or, from the command line, use git fetch and then git status.

    In SourceTree there should be a fork in the development line in the commit list. This is an indication that you must merge. From the command line, git status will tell you that the two lines have diverged.

  6. As you can see in the commit list for the master branch, the two development lines are split. You must merge the changes on the server. Either use the Pull button, or click Merge and then select the commit on the server to merge into your local Master. Or, from the command line, use git merge origin/master._

    You should have gotten a dialog box in SourceTree indicating that there are conflicts.

  7. Resolve the conflicts and commit.

    You can either resolve the conflicts in an editor or, if you have configured an exernal merge tool, launch it by right-clicking on the file in the Working Copy view and selecting Resolve Conflicts > Launch External Merge Tool.

  8. Push the changes to the remote on GitHub.

    All of master, origin/master, and origin/HEAD should be on the same commit again.