dhbora/AppShop---Programming-Kingston-University — Issue #2: Chamandeep please review your last changes
Author: dhbora
Created: 2011-12-27 14:36:39+00:00
State: open

Hi Chamandeep,
I've looked at your changes and unfortunately there are some issues with them.
1) It seems that you've added getPrice(), the problem is that it was already done by me before you even said you're working on them. look at my changes that I pushed last night.
2) When 2 people work on the same file at the same time, they have 2 different versions of the file. When the first person wants to push the changes it's fine but when the second person tries to push the files git shows an error and tells you that you cannot fast-forward these changes. Now you have to merge the 2 versions of the file. Git makes it easier by attaching the old version at the end of the file. You should now paste the old lines of code to where they are supposed to be and remove the lines of code that are not needed. Please check paidApp.h which shows that you haven't done that. The program would not compile if you don't do it properly.
3) I can see in the iamWorkingOn.txt that you want to work on the orders but I've already put it in my section so I am working on it

I'll have to remove your last commits from the server. Please review your changes and if there is something that we haven't done before, please push those changes but getPrice() is already done.

Mateusz