git is a version control system. git is free software. version 1 commit~ <<<<<<< HEAD version 2 commit~ test mergecode for studying git. ======= version 2 commit switch to branch dev >>>>>>> dev
git is a version control system. git is free software. version 1 commit~ <<<<<<< HEAD version 2 commit~ test mergecode for studying git. ======= version 2 commit switch to branch dev >>>>>>> dev