Skip to content

x04: Resolve merge conflict in main.cpp (Closes #62) #324

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
laurunion wants to merge 2 commits into
base: main
Choose a base branch
from
Open

x04: Resolve merge conflict in main.cpp (Closes #62) #324

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0924efe
x04: Resolve merge conflict in main.cpp (Closes #62)
Sep 10, 2025
a140e6a
Create README.md
laurunion Sep 17, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
[![Build C++](https://github.com/laurunion/MyFirstExample/actions/workflows/build.yml/badge.svg)](https://github.com/laurunion/MyFirstExample/actions/workflows/build.yml)
22 changes: 11 additions & 11 deletions main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,21 +1,21 @@
#include <iostream>
using namespace std;
#include <cmath>

int main()
{
std::cout << "THE FIRST EXAMPLE MATH DISPLAY!\n";
std::cout << "Hi, please enter two whole numbers: ";
cout << "THE FIRST EXAMPLE MATH DISPLAY!\n";
cout << "Hi, please enter two whole numbers: ";

int x,y;

std::cin >> x >> y;
std::cout << "Addition: " << x + y << std::endl;
std::cout << "Subtraction: " << x - y << std::endl;
std::cout << "Multiplication: " << x * y << std::endl;
std::cout << "Division: " << x / y << std::endl;
std::cout << "Remainder: " << x % y << std::endl;
std::cout << "Square Root: " << sqrt(x) << std::endl;
std::cout << "Square: " << pow(x, y) << std::endl;

cin >> x >> y;
cout << "Addition: " << x << "+" << y << "=" << x + y << endl;
cout << "Subtraction: "<< x << "-" << y << "=" << x - y << endl;
cout << "Multiplication: " << x << "*" << y << "=" << x * y << endl;
cout << "Division: " << x << "/" << y << "=" << x / y << endl;
cout << "Remainder: " << x << "%" << y << "=" << x % y << endl;
cout << "Square Root: " << "√" << x << "=" << sqrt(x) << endl;
cout << "Square: " << x << "^" << y << "=" << pow(x, y) << endl;
return 0;
}