Skip to content

Shihab #2

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
ShihabZak wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Shihab #2

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9d693d4
Add base code for Shihab
nvf Nov 11, 2025
f1ac2b0
Update CommitCafe.java
ShihabZak Nov 11, 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
10 changes: 5 additions & 5 deletions CommitCafe.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
public class CommitCafe {
public static void main(String[] args) {
String barista = "Base";
int cups = 0;
String barista = "Starbocks";
int cups = 5;

// TODO: Simulate a merge conflict by editing this file.
// Replace the println() below with your own message or pun.
System.out.println(barista + " brewed " + cups + " cups today.");
System.out.println(barista + " brewed " + cups + " cups of qahwa this mornin");
}
}

// Branch for Shihab