Menu
I accidently worked on the master where I had to open up a new branch.
I reverted it to its original form almost completely. At one class I get the following diff that I can not make sense out of.
index 4a9abb8..7c55879 100755
--- a/includes/site.inc.php
+++ b/includes/site.inc.php
@@ -142,11 +142,11 @@ class site{
public $tplEngine = 'smarty';
-
+
private $_productsByType = array();
private $logger;
- protected $locale = 'tr_TR';
-
+ protected $locale = 'tr_TR';
+
It says that I have deleted and added the same thing, in principle there is no difference with the original index and I don't want this file to be seen as modified.
What should I do ? Thx.
447
You can use git diff --name-status, that will show you files that where added, modified and deleted.
When viewing a combined diff, if the two files you're comparing have a line that's different from what they were merged into, you will see the ++ to represent: one line that was added does not appear in either file1 or file2.
The git diff command helps you see, compare, and understand changes in your project. You can use it in many different situations, e.g. to look at current changes in your working copy, past changes in commits, or even to compare branches.
In most cases, Git picks A and B in such a way that you can think of A/- as "old" content and B/+ as "new" content. Let's look at our example: Change #1 contains two lines prepended with a "+". Since no counterpart in A existed for these lines (no lines with "-"), this means that these lines were added.
It's probably whitespace changes. You can run git diff -w, which will ignore any whitespace changes.
109
Check spaces. The replaced "empty" looking lines have spaces in them. You may also have accidentally replaced tabs with spaces or vice versa.
13
If you love us? You can donate to us via Paypal or buy me a coffee so we can maintain and grow! Thank you!
Donate Us With
