designproject-design-6/src/main/java/design/controller/userinput, branch main Unnamed repository; edit this file 'description' to name the repository. Merge branch 'main' into league-model 2025-11-16T07:15:49+00:00 sowgro tpoke.ferrari@gmail.com 2025-11-16T07:15:49+00:00 6ffc6b4cbd9e0c5ce2dc82a7c77f39b3adf849b6 # Conflicts: # src/main/java/design/controller/userinput/menus/MainMenu.java # src/main/java/design/model/Golfer.java # src/main/java/design/model/ScrambleLeague.java # src/test/java/design/model/GolferTest.java # test.xml 
# Conflicts:
#	src/main/java/design/controller/userinput/menus/MainMenu.java
#	src/main/java/design/model/Golfer.java
#	src/main/java/design/model/ScrambleLeague.java
#	src/test/java/design/model/GolferTest.java
#	test.xml
tweak main menu 2025-11-16T07:12:47+00:00 sowgro tpoke.ferrari@gmail.com 2025-11-16T07:12:47+00:00 b5d46c7701716bcb2dd6127aeb97f8fcdb7774fc 






Merge pull request #19 from RIT-SWEN-262/import-export
2025-11-16T07:03:16+00:00

Tyler Ferrari
69283684+Sowgro@users.noreply.github.com

2025-11-16T07:03:16+00:00

64dd072264dd59457cb195f23d17f03720b1cca0

Import export




Import export






Merge branch 'main' into import-export
2025-11-16T07:01:58+00:00

sowgro
tpoke.ferrari@gmail.com

2025-11-16T07:01:58+00:00

969b8071dd799dfaed939e10bf77b8a1ad42f9dc

# Conflicts:
#	data/personaldb.json
#	src/main/java/design/controller/userinput/menus/MainMenu.java
#	src/main/java/design/persistence/JSONLeagueDatabase.java
#	src/main/java/design/persistence/JSONPersonalDatabase.java
#	src/test/java/design/model/ClubTest.java
#	src/test/java/design/model/GolferTest.java





# Conflicts:
#	data/personaldb.json
#	src/main/java/design/controller/userinput/menus/MainMenu.java
#	src/main/java/design/persistence/JSONLeagueDatabase.java
#	src/main/java/design/persistence/JSONPersonalDatabase.java
#	src/test/java/design/model/ClubTest.java
#	src/test/java/design/model/GolferTest.java







fix nulls
2025-11-16T04:27:40+00:00

sowgro
tpoke.ferrari@gmail.com

2025-11-16T04:27:40+00:00

73cb1c77c99330360313bb07fcbc3c23a2516680












export almost working
2025-11-14T01:05:25+00:00

sowgro
tpoke.ferrari@gmail.com

2025-11-14T01:05:25+00:00

9adc51f8d74577b5c4ae9c1f88341252f2c22939












change league printing
2025-11-13T13:41:56+00:00

sowgro
tpoke.ferrari@gmail.com

2025-11-13T13:41:56+00:00

0294bd3a3121d6166788594f7249bf293cb00896












Merge remote-tracking branch 'origin/league-model'
2025-11-13T13:20:04+00:00

sowgro
tpoke.ferrari@gmail.com

2025-11-13T13:20:04+00:00

c1bf473e5c6735ae00c3fbfec0f9d16c421387db

# Conflicts:
#	src/main/java/design/controller/userinput/menus/MainMenu.java
#	src/main/java/design/model/Golfer.java
#	src/test/java/design/model/ClubTest.java
#	src/test/java/design/model/GolferTest.java





# Conflicts:
#	src/main/java/design/controller/userinput/menus/MainMenu.java
#	src/main/java/design/model/Golfer.java
#	src/test/java/design/model/ClubTest.java
#	src/test/java/design/model/GolferTest.java







stub out some menus
2025-11-12T17:57:08+00:00

sowgro
tpoke.ferrari@gmail.com

2025-11-12T17:57:08+00:00

af23c48329b749ba3d0a4fcd841723d55a16ae95












fixed exporting xml
2025-11-11T21:42:39+00:00

WillemDalton
willemhdalton@gmail.com

2025-11-11T21:42:39+00:00

d29548bd7d04375578361f6a75659c046a270b75