Week 10: Lab 6 and HW 6 - Introductory Programming in Java Skip navigation Introductory Programming in Java ANU College of Engineering & Computer Science Search query Search ANU web, staff & maps Search COMP6700 Lectures Labs Assignments menu Search query Search ANU web, staff & maps Search Search COMP6700 labs Week 01: Welcome Week 02: Lab 1 Week 03: Lab 2 and HW 1 Week 04: Lab 3 and HW 2 Week 05: Drop-in Lab, HW 3 Week 06: Lab 4 and HW 4 Week 07: Mid-sem Exam Week 08: Free (Anzac Day) Week 09: Lab 5 and HW 5 Week 10: Lab 6 and HW 6 Week 11: Lab 7 and HW 7 Week 12: Lab 8 and HW 8 related sites Wattle Piazza Week 10: Lab 6 and HW 6 Before you start working on Lab 6, make sure you update your Git repository to the latest version of the upstream code. Using the command line (Terminal application on Mac/Linux, or Git-Bash on Windows) in the directory of your local comp6700-2017 repository, execute the following commands: git fetch git@gitlab.cecs.anu.edu.au:u1234567/comp6700-2017.git master
git checkout -b u1234567/comp6700-2017-master FETCH_HEAD
Review the changes if required; then merge the branch and fix any conflicts that come up: git checkout master
git merge --no-ff u1234567/comp6700-2017-master
Lab Six The Homework Six is due for marking: Either present it in a usual way during the Lab session, OR Submit it to your forked GitLab repository (as practiced last week, and don’t forget to include a meaningful log entry) before Friday, May 12, 18:00, and inform your tutor next week (so they would know whom to mark). Updated: 02 May 2017/ Responsible Officer: Head of School/ Page Contact: Alexei Khorev Contact ANU Copyright Disclaimer Privacy Freedom of Information +61 2 6125 5111 The Australian National University, Canberra CRICOS Provider : 00120C ABN : 52 234 063 906 You appear to be using Internet Explorer 7, or have compatibility view turned on. Your browser is not supported by ANU web styles. » Learn how to fix this » Ignore this warning in future