README.md

Maze Task

Template Maze Task Documentation: https://docs.google.com/document/d/1mmQLQhJR1E_ozdP1e9LD4sO0lWMukzI4Q-NWyUVPxMQ/edit?usp=sharing

Requirements

1. Unity 2018 4.0f1 LTS You can download here: https://unity3d.com/get-unity/download/archive
2. Git LFS Make sure you have Git LFS: https://git-lfs.github.com/

Clone this repo

git clone https://github.com/ReCVEB/NewMazeTask.git

Push to this repo

To add your changes to commit

git add .

To commit

git commit -m "commit message"

To push

git push origin master

Pull updates

cd your_directory/MazeTask
git pull

Merge Conflicts

git checkout --ours folderA/filename.xxx
git checkout --theirs folderB/filename.yyy

Revert all your changes

git stash