The time has come. It was the time to merge our individual projects by Github. We predicted that, we would have hard time merging our projects together as it was first time to merge real project.
Merging with Github
Being nervous, we started to add, commit, and push our local projects to remote space. We also made some temporary branches for safety reason.
Even though we expected this difficulty and practiced with small projects, it was still difficult and had lots of conflicts. But as we made really hard efforts together for almost 1 whole day, we succeeded to combine our projects in github.