Skip to content

Zhuoyan #5

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

Zhuoyan #5

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1241eeb
Add base code for Zhuoyan
nvf Nov 11, 2025
5fcbff7
A small change
qhynSamuel Nov 11, 2025
2580e4f
Merge remote-tracking branch 'origin/main' into zhuoyan
qhynSamuel Nov 11, 2025
463a221
Merge branch 'main' into zhuoyan
qhynSamuel 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: 7 additions & 3 deletions CommitCafe.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,13 @@
public class CommitCafe {
public static void main(String[] args) {
String barista = "nvf";
int cups = 23;
int cups = 16;

System.out.println("nvf brewed 23 cups today.");
System.out.println("Keep calm and merge the mocha.");
// Added by Zhuoyan Cen for in-class merge exercise
System.out.println(barista + " brewed " + cups + " cups today_zhc.");
System.out.println("Commit your coffee, not your code before it compiles.");
}
}

// Branch for Zhuoyan