Today is a happy day for us,finally we managed to clean up all the conflicts.
We had issues with rebasing,but after a long struggle we managed to update our repository..#so glad its up to date
our awesome mentor @Maren helped us a lot.
Learning how to write good commit messages (http://chris.beams.io/posts/git-commit/)
Learning git diff (http://git-scm.com/docs/git-diff) (https://schacon.github.io/gitbook/3_comparing_commits_-_git_diff.html)
wrote some tests on admin controller (https://github.com/Techylite/speakerinnen_liste/blob/newdesign/spec/controllers/Admin/profile_controller_spec.rb)
Oh! did I mention our tests were merged(#awesome #quite encouraging #shout out to Maren)
You must be logged in to add a comment.