r-cube

Pratice GitHub repository for practicing resolving merge conflicts.

Instructions

Instructions

1. Click the green "Use this template" button in this repository to obtain a copy of it for yourself (do not fork it).

2. Clone this repository to your computer.

3. Create a remote branch named make-conflict (this will use GitHub Actions to create a commit in your remote repository).

4. Fix the second line in cube.r so that it calculates the cube, not the square (e.g., change x^2 to x^3). Commit your changes to version control via Git and push your changes to GitHub.

5. Resolve the merge conflict them so that you can see your changes on GitHub.