Differences

This shows you the differences between two versions of the page.

--- howto:git [2021/12/26 12:14] – va7fi
+++ howto:git [2021/12/26 12:24] – [Test Scenarios] va7fi
@@ Line 196: / Line 196: @@
 -rwxrwx--- 1 ptruchon www-data 26 Dec 26 10:20 file2.txt
 </code>
+==== www-data:www-data files ====
+Sometimes Dokuwiki saves new files with the ''www-data:www-data'' ownership.  When this happens, Git is not able to override the changes.
+  * Change ownership of ''file2.txt'' or remote:<code bash>
+~/gittest/remote$ sudo chown www-data:www-data file2.txt
+ls -l
+total 24
+-rwxrwxr-x 1 ptruchon www-data 50 Dec 26 12:01 file1.txt
+-rwxrwx--- 1 www-data www-data 26 Dec 26 10:20 file2.txt
+</code>
+  * Edit ''file2.txt'' on local and commit the changes:<code bash>
+~/gittest/local$ git add .
+git commit -m 'edited file2.txt on local'
+[master b7c9353] edited file2.txt on local
+file changed, 1 insertion(+)
+git status
+On branch master
+Your branch is ahead of 'origin/master' by 1 commit.
+  (use "git push" to publish your local commits)
+nothing to commit, working tree clean
+git log
+commit b7c93538a15efe16ac60956ce3f77526ce43ec1d (HEAD -> master)
+Author: Patrick Truchon <patoo@rbox.me>
+Date:   Sun Dec 26 12:22:38 2021 -0800
+    edited file2.txt on local
+commit b7d91058fed9fe64c96525a3d0bef56c682ade68 (origin/master, origin/HEAD)
+Author: Patrick Truchon <patoo@rbox.me>
+Date:   Sun Dec 26 10:45:41 2021 -0800
+    changed file1.txt from local
+commit 0e5ccdedd1c9188996aadad3a8e2be5a319ab789
+Author: Patrick Truchon <patoo@rbox.me>
+Date:   Sun Dec 26 10:21:24 2021 -0800
+    initial commit on remote
+</code>