diff --git a/.gitignore b/.gitignore index c3e3294..112fbf0 100644 --- a/.gitignore +++ b/.gitignore @@ -41,3 +41,8 @@ cmake-build-debug .idea .DS_Store + +#Directories +cmake-build-debug +.idea +.DS_Store diff --git a/README.md b/README.md index 618e0c2..2d4e938 100644 --- a/README.md +++ b/README.md @@ -1,41 +1,19 @@ # MPK.Puzzle MPK Projekt Puzzle Solver +Don't merge branch to master unless you are absolutely, 100% sure it works and you have discussed it with pm! + # Git intro 0, read github tutorial 1, Clone repository -2, branch master into a team branch +2, branch master into a team branch (named "Team"+[teamname]) -3, work only in this branch +3, work only in this team branch or subbranches 4, don't ever touch the master. Seriously. don't merge branch to master unless you are absolutely, 100% sure it works and you have discussed it with pm. -# Current Todo -Git for Puzzle solving project - -1, Input: - --Puzzle Bilder in richtige Orientierung bringen - --Puzzle Bilder informaion rein raus oder kante extrahieren - --Schnittstelle zwischen Input und Solver definieren - -2, Solver - --Grundsätzliche Aufbauweise - --Puzzle nach bekommenen Informationen der Input Gruppe lösen -soweit dies möglich ist- - -3, Output - --Transparenz der Bilder einstellen - --visuelle Darstellung des outputs von Solver - --Schnittstelle zwischen Solver und Output definieren