How do I redo a git merge
Reading Time: < 1 minutes When you have merge conflict in your code and you get No files need merging when you run `git mergetool` Solution: Do git reset –hard # You are not going to loose any changes all your code would be committed by now. However you will have a clean working dir ready to do the merging. […]
What is the “inconsistent use of tabs and spaces in indentation” error and why is it caused? and what is the solution
Reading Time: 2 minutes Knowingly or unknowingly you have used spaces instead of tabs, or the tabs are inconsistent in your python code. To solve this problem you should first make it apparent what is culprit and where is the culprit. I mean to display the spaces and Tabs. To see that you can follow the steps below in […]