├── README.md ├── another-dummy ├── .gitignore ├── conflicts.R └── project.Rproj /README.md: -------------------------------------------------------------------------------- 1 | # git-tutorial 2 | testing 1 2 3 3 | -------------------------------------------------------------------------------- /another-dummy: -------------------------------------------------------------------------------- 1 | AAA 2 | CCC 3 | FFF 4 | DDD 5 | AAA 6 | -------------------------------------------------------------------------------- /.gitignore: -------------------------------------------------------------------------------- 1 | .Rproj.user 2 | .Rhistory 3 | .RData 4 | .Ruserdata 5 | stupid.txt 6 | -------------------------------------------------------------------------------- /conflicts.R: -------------------------------------------------------------------------------- 1 | A 2 | BF 3 | A 4 | fasfas 5 | safd 6 | asfdaf 7 | asd 8 | fads 9 | dfda 10 | sfda 11 | -------------------------------------------------------------------------------- /project.Rproj: -------------------------------------------------------------------------------- 1 | Version: 1.0 2 | 3 | RestoreWorkspace: Default 4 | SaveWorkspace: Default 5 | AlwaysSaveHistory: Default 6 | 7 | EnableCodeIndexing: Yes 8 | UseSpacesForTab: Yes 9 | NumSpacesForTab: 2 10 | Encoding: UTF-8 11 | 12 | RnwWeave: Sweave 13 | LaTeX: pdfLaTeX 14 | --------------------------------------------------------------------------------