Skip to content

nickembrey/tic-tac-toe

 
 

Folders and files

NameName
Last commit message
Last commit date

Latest commit

 

History

2 Commits
 
 
 
 
 
 
 
 
 
 
 
 
 
 

Repository files navigation

Tic-Tac-Toe Testing Example

This is a simple Tic-Tac-Toe implementation used for demonstrating:

  • Unit testing with CTest
  • GitHub workflow (forking, pull requests)
  • Merge conflicts

Building

mkdir build
cd build
cmake --build . 
make

Running Tests

ctest --verbose

Merge Conflict Scenario

This repository demonstrates a realistic merge conflict scenario:

Branch: feature/ai-opponent

  • Adds AI opponent functionality to TicTacToe.cpp
  • Modifies the makeMove() function to track move history

Branch: feature/undo-move

  • Adds undo functionality to TicTacToe.cpp
  • Also modifies the makeMove() function to save previous state

When both branches are merged, they conflict because they both modify the same makeMove() function in different ways.

About

No description, website, or topics provided.

Resources

Stars

Watchers

Forks

Releases

No releases published

Packages

 
 
 

Contributors

Languages

  • C++ 91.0%
  • CMake 9.0%