search

IEEE-VIT / termiboard

A smart CLI Dashboard to fetch cpu, memory and network stats!
MIT License
35 stars 16 forks source link

Completed GetLocalIPAddress() in network.go #8

Closed 0vj closed 3 years ago

0vj commented 3 years ago

Completed GetLocalIPAddress() in network.go issue :

DarthBenro008 commented 3 years ago

@mr-tafreshi please resolve your merge conflicts and squash your commits.

0vj commented 3 years ago

Resolved ! :)

DarthBenro008 commented 3 years ago

Your codebase doesn't seem consistent with the master branch hence the lint is failing, please resolve the lint issues.

0vj commented 3 years ago

I don't think there is a problem with the code. Can you tell me where the problem is?

DarthBenro008 commented 3 years ago

@mr-tafreshi The code works fine, if you check the network.go file in the master branch the unused functions are commented out which is not in the case of your commit changes, hence the inconsistency. please make sure everything else is same as master branch except the changes you have made to your function

0vj commented 3 years ago

That is, to use the function I completed? I just completed the GetLocalIPAddress() in network.go

DarthBenro008 commented 3 years ago

@mr-tafreshi i am pointing our once again, compare the network.go file in your branch vs the network.go file in the master branch, you will find that the unused functions are commented out in the master branch but not in yours. This issue has arised because of improper resolve of the merge conflict encountered before.

0vj commented 3 years ago

Oh. I understood my problem. I have to comment functions of the network.go . it's true ?

DarthBenro008 commented 3 years ago

Yes, please make sure its consistent with the master branch

0vj commented 3 years ago

Ok. I will close this pr and create new pr