Pull and Push

[zishan0215]

We are having issues related to pull and push requests.. Its better to have this discussion here so that others can see this if they have any problem

[wadhwasahil]

ok

[zishan0215]

@wadhwasahil you sent me a pull request. however, it contains all the previous files as well

[zishan0215]

it has 3 commits and the only commit that is of use is the last commit.. other two are repetitions of the code already present ..

[wadhwasahil]

so what to do now?

[zishan0215]

i cant accept this pull request as this will overwrite the existing code which i have further modified.. send me a pull request of only the changes you made for the teacher view

[wadhwasahil]

but how?

[zishan0215]

i dont know.. maybe create a branch or something

[wadhwasahil]

i will give you that folder on monday?

[zishan0215]

copy the files you just created.. then pull the code from my account.. then create a branch for teacher_admin and add those files in the code for that branch.. then send me a request to merge the branch

[nickedes]

i think we all shud make a separate branch of our codes..n den send Pull requests

[zishan0215]

@nkmittal4994 yes.. you are right

[nickedes]

zishan shud i send u a PR of a dashboard code..or will u add d file..? btw i have to check it..too :P

[zishan0215]

send me a PR.. if you do it right then leave your steps here for others to see

[zishan0215]

but send me a PR once youve tested the dashboard

[nickedes]

okie will do :+1:

[zishan0215]

:-)

[nickedes]

:tada: