Personal Devices

You may choose to work on class assignments on your own personal device rather than on EWS machines. However, you should always verify that your submission works on EWS machines because the EWS environment is used by the auto-grader. If you do decide to use your own machine, you will have to learn how to pull your own code from your class repository and how to resolve potential merge conflicts.

Workflow

Suppose that you have cloned your repository on both your EWS account and your personal device. At some point, you may have made edits and pushed these edits from one of the machines and wish to work on the other machine. To do so, you will first need to pull the changes from your class repository:

git pull origin main

This will bring in the edits you made from the other machine unto the current machine.

Merge Conflicts

If there were any changes in the repository on your current machine, then Git may tell you that there are merge conflicts. To see the merge conflicts, run:

git status

There will be a list of files under the heading Unmerged paths for any merge conflicts. For each merge conflict, do the following:

<<<<<<< HEAD 
i += 1;
======= 
i += 2;
>>>>>>> origin/main
i += 3;
All rights reserved by ECE220@UIUC. Design by Asher Mai & Ivan Abraham.
Last modified: December 28, 2023. Website built with Franklin.jl and the Julia programming language.