05/11/2020 Tutorial Task (Merge conflict): SOFT2412 and COMP9412 Agile Software Development Practices
Tutorial Task (Merge conflict)
Tasks to Do
Work on the following scenarios in your groups:
Scenario one: Two people pull the coding files from main repository. They edit different files and they push on the same time.
1. Follow the GitHub flow to work on the code.
2. What happens if you try to push on the same time?
3. If there is any issue, how do you solve it?
Scenario two: Two people pull the code. They work on the same file. After editing, they try to push at the same time.
1. What happens in this situation? 2. How do you resolve the issue?
Scenario three: Two people pull the code. They work on the same line of code. After editing, they try to push at the same time.
1. What happens in this situation? 2. How do you resolve the issue?
Copyright ý The University of Sydney. Unless otherwise indicated, 3rd party material has been reproduced and communicated to you by or on behalf of the University of Sydney in accordance with section 113P of the Copyright Act 1968 (Act). The material in this communication may be subject to copyright under the Act. Any further reproduction or communication of this material by you may be the subject of copyright protection under the Act. Do not remove this notice.
Live streamed classes in this unit may be recorded to enable students to review the content. If you have concerns about this, please visit our student guide (https://canvas.sydney.edu.au/courses/4901/pages/zoom) and contact the unit coordinator.
https://canvas.sydney.edu.au/courses/25875/pages/tutorial-task-merge-conflict?module_item_id=940109 1/2
05/11/2020 Tutorial Task (Merge conflict): SOFT2412 and COMP9412 Agile Software Development Practices
https://canvas.sydney.edu.au/courses/25875/pages/tutorial-task-merge-conflict?module_item_id=940109 2/2