Welcome to our ICPC programming competition repository! This repository is structured to help us collaborate efficiently as a team while keeping our work organized. Below are guidelines on how to use this repository.
Each team member has their own unique folder to work on their solutions or experiments. The repository follows this structure:
.
├── ali/ # Folder for Ali solutions
├── amirreza/ # Folder for Amirreza solutions
├── rahmat/ # Folder for Rahmat solutions
├── .gitignore # Ignoring unnecessary files
├── README.md # Collaboration guide
└── update.py # Script to automate Git pull/push
Each person should only work in their assigned folder to avoid conflicts.
- Clone the repository:
git clone https://github.com/ctrl-alt-Defeat-icpc/NERC2024.git
- you should write your solutions in your own folder!
- Ensure the .gitignore file is in place to keep unnecessary files out of the repository.
To keep your local repository up-to-date and push your changes, use the update.py
script.
python update.py
or
python3 update.py
This will:
- Pull the latest changes from the repository.
- Add and commit changes in your folder.
- Push your changes back to the repository.
Solving Conflicts
If you encounter merge conflicts:
- Identify the conflicting files in the Git output.
- Open the files and manually resolve the conflicts.
- After resolving conflicts:
python update.py
Let’s collaborate effectively and do our best in the competition! 🎉