The change in the function of user.service.ts is just moving the private function after the public function.
Lastly this issue turned out to be a medium due to strange dependency issues with require() and jest.
Edit:
Some testing related issues were fixed as a part of resolving the merge conflict.
Added fix for authenticate.service.ts as it was changed to get Creds from nodegit and wasn't fixed in the tests due to the test being merged in later (#237).
Added fix for random errors when running tests in authenticate.component.ts (thanks to @sloushsu).
Resolves #150 thanks to the help of @sloushsu.
The change in the function of
user.service.tsis just moving the private function after the public function.Lastly this issue turned out to be a medium due to strange dependency issues with require() and jest.
Edit: Some testing related issues were fixed as a part of resolving the merge conflict.
authenticate.service.tsas it was changed to getCredsfromnodegitand wasn't fixed in the tests due to the test being merged in later (#237).authenticate.component.ts(thanks to @sloushsu).