Truelogic Blog

Resolving git conflicts using ‘theirs’ or ‘ours’

git

If you want to overwrite your local copy of the conflicted file use the following commands: git checkout –theirs path/to/the/conflicted_file.php git add path/to/the/conflicted_file.php   If you want to overwrite the version in the repository with your version then git checkout –ours path/to/the/conflicted_file.php git add path/to/the/conflicted_file.php   Do a commit after making the changes above.  

Detect Similar Documents Using C#

84cc0124-1389-4285-9825-6efc837725dd

Discovering identical content or similar content is done using an algorithm called Finding Document Distance. Using this algorithm, applications for finding copyright infringements, detecting duplicate content and similar content can be effectively created. You can find explanations of this algorithm by searching on Google so this post will not go into the details of the…

Detect Similar Documents Using PHP

84cc0124-1389-4285-9825-6efc837725dd

Discovering identical content or similar content is done using an algorithm called Finding Document Distance. Using this algorithm, applications for finding copyright infringements, detecting duplicate content and similar content can be effectively created. You can find explanations of this algorithm by searching on Google so this post will not go into the details of the…