Skip to content

Instantly share code, notes, and snippets.

@eighthave

eighthave/conflict-files.txt

Created June 3, 2013 20:55
Show Gist options
  • Save eighthave/5701333 to your computer and use it in GitHub Desktop.
Save eighthave/5701333 to your computer and use it in GitHub Desktop.
Download ZIP
sparkelshare conflict issue #1170 https://github.com/hbons/SparkleShare/issues/1170
Raw
conflict-files.txt
`ls -l > /tmp/conflict-files.txt`
total 4340
drwxr-xr-x 2 hans hans 4096 May 15 19:48 Google Play Store Screenshots
-rw-r--r-- 1 hans hans 14181 Jun 3 16:32 GPGTools (Hans-Christoph Steiner, Jun 3 16h32).png
-rw-r--r-- 1 hans hans 14181 Jun 3 16:32 GPGTools (Hans-Christoph Steiner, Jun 3 16h33).png
-rw-r--r-- 1 hans hans 14181 Jun 3 16:33 GPGTools (Hans-Christoph Steiner, Jun 3 16h34).png
-rw-r--r-- 1 hans hans 14181 Jun 3 16:34 GPGTools (Hans-Christoph Steiner, Jun 3 16h35).png
-rw-r--r-- 1 hans hans 14181 Jun 3 16:35 GPGTools (Hans-Christoph Steiner, Jun 3 16h36).png
-rw-r--r-- 1 hans hans 14181 Jun 3 16:36 GPGTools (Hans-Christoph Steiner, Jun 3 16h37).png
-rw-r--r-- 1 hans hans 14181 Jun 3 16:37 GPGTools (Hans-Christoph Steiner, Jun 3 16h38).png
-rw-r--r-- 1 hans hans 14181 Jun 3 16:38 GPGTools (Hans-Christoph Steiner, Jun 3 16h39).png
-rw-r--r-- 1 hans hans 14181 Jun 3 16:39 GPGTools (Hans-Christoph Steiner, Jun 3 16h40).png
-rw-r--r-- 1 hans hans 14181 Jun 3 16:40 GPGTools (Hans-Christoph Steiner, Jun 3 16h41).png
-rw-r--r-- 1 hans hans 14181 Jun 3 16:41 GPGTools (Hans-Christoph Steiner, Jun 3 16h42).png
-rw-r--r-- 1 hans hans 14181 Jun 3 16:42 GPGTools (Hans-Christoph Steiner, Jun 3 16h43).png
-rw-r--r-- 1 hans hans 14181 Jun 3 16:43 GPGTools (Hans-Christoph Steiner, Jun 3 16h44).png
-rw-r--r-- 1 hans hans 14181 Jun 3 16:44 GPGTools (Hans-Christoph Steiner, Jun 3 16h45).png
drwxr-xr-x 19 hans hans 4096 Jun 3 16:31 Graphics
drwxr-xr-x 3 hans hans 4096 Jun 3 16:31 Guardian Project Graphics
drwxr-xr-x 2 hans hans 4096 Apr 15 12:56 Guardian Project Overview Deck
-rw-r--r-- 1 hans hans 41851 Jan 26 10:27 Guardian Project Public.png
-rw-r--r-- 1 hans hans 8903 Jun 3 16:32 logo-gnupg-light-green2-bg copy (Hans-Christoph Steiner, Jun 3 16h32).png
-rw-r--r-- 1 hans hans 8903 Jun 3 16:32 logo-gnupg-light-green2-bg copy (Hans-Christoph Steiner, Jun 3 16h33).png
-rw-r--r-- 1 hans hans 8903 Jun 3 16:33 logo-gnupg-light-green2-bg copy (Hans-Christoph Steiner, Jun 3 16h34).png
-rw-r--r-- 1 hans hans 8903 Jun 3 16:34 logo-gnupg-light-green2-bg copy (Hans-Christoph Steiner, Jun 3 16h35).png
-rw-r--r-- 1 hans hans 8903 Jun 3 16:35 logo-gnupg-light-green2-bg copy (Hans-Christoph Steiner, Jun 3 16h36).png
-rw-r--r-- 1 hans hans 8903 Jun 3 16:36 logo-gnupg-light-green2-bg copy (Hans-Christoph Steiner, Jun 3 16h37).png
-rw-r--r-- 1 hans hans 8903 Jun 3 16:37 logo-gnupg-light-green2-bg copy (Hans-Christoph Steiner, Jun 3 16h38).png
-rw-r--r-- 1 hans hans 8903 Jun 3 16:38 logo-gnupg-light-green2-bg copy (Hans-Christoph Steiner, Jun 3 16h39).png
-rw-r--r-- 1 hans hans 8903 Jun 3 16:39 logo-gnupg-light-green2-bg copy (Hans-Christoph Steiner, Jun 3 16h40).png
-rw-r--r-- 1 hans hans 8903 Jun 3 16:40 logo-gnupg-light-green2-bg copy (Hans-Christoph Steiner, Jun 3 16h41).png
-rw-r--r-- 1 hans hans 8903 Jun 3 16:41 logo-gnupg-light-green2-bg copy (Hans-Christoph Steiner, Jun 3 16h42).png
-rw-r--r-- 1 hans hans 8903 Jun 3 16:42 logo-gnupg-light-green2-bg copy (Hans-Christoph Steiner, Jun 3 16h43).png
-rw-r--r-- 1 hans hans 8903 Jun 3 16:43 logo-gnupg-light-green2-bg copy (Hans-Christoph Steiner, Jun 3 16h44).png
-rw-r--r-- 1 hans hans 8903 Jun 3 16:44 logo-gnupg-light-green2-bg copy (Hans-Christoph Steiner, Jun 3 16h45).png
-rw-r--r-- 1 hans hans 8903 Jun 3 16:32 logo-gnupg-light-green2-bg (Hans-Christoph Steiner, Jun 3 16h32).png
-rw-r--r-- 1 hans hans 8903 Jun 3 16:32 logo-gnupg-light-green2-bg (Hans-Christoph Steiner, Jun 3 16h33).png
-rw-r--r-- 1 hans hans 8903 Jun 3 16:33 logo-gnupg-light-green2-bg (Hans-Christoph Steiner, Jun 3 16h34).png
-rw-r--r-- 1 hans hans 8903 Jun 3 16:34 logo-gnupg-light-green2-bg (Hans-Christoph Steiner, Jun 3 16h35).png
-rw-r--r-- 1 hans hans 8903 Jun 3 16:35 logo-gnupg-light-green2-bg (Hans-Christoph Steiner, Jun 3 16h36).png
-rw-r--r-- 1 hans hans 8903 Jun 3 16:36 logo-gnupg-light-green2-bg (Hans-Christoph Steiner, Jun 3 16h37).png
-rw-r--r-- 1 hans hans 8903 Jun 3 16:37 logo-gnupg-light-green2-bg (Hans-Christoph Steiner, Jun 3 16h38).png
-rw-r--r-- 1 hans hans 8903 Jun 3 16:38 logo-gnupg-light-green2-bg (Hans-Christoph Steiner, Jun 3 16h39).png
-rw-r--r-- 1 hans hans 8903 Jun 3 16:39 logo-gnupg-light-green2-bg (Hans-Christoph Steiner, Jun 3 16h40).png
-rw-r--r-- 1 hans hans 8903 Jun 3 16:40 logo-gnupg-light-green2-bg (Hans-Christoph Steiner, Jun 3 16h41).png
-rw-r--r-- 1 hans hans 8903 Jun 3 16:41 logo-gnupg-light-green2-bg (Hans-Christoph Steiner, Jun 3 16h42).png
-rw-r--r-- 1 hans hans 8903 Jun 3 16:42 logo-gnupg-light-green2-bg (Hans-Christoph Steiner, Jun 3 16h43).png
-rw-r--r-- 1 hans hans 8903 Jun 3 16:43 logo-gnupg-light-green2-bg (Hans-Christoph Steiner, Jun 3 16h44).png
-rw-r--r-- 1 hans hans 8903 Jun 3 16:44 logo-gnupg-light-green2-bg (Hans-Christoph Steiner, Jun 3 16h45).png
-rw-r--r-- 1 hans hans 10490 Jun 3 16:32 logo-gnupg-light-green3-bg (Hans-Christoph Steiner, Jun 3 16h32).png
-rw-r--r-- 1 hans hans 10490 Jun 3 16:32 logo-gnupg-light-green3-bg (Hans-Christoph Steiner, Jun 3 16h33).png
-rw-r--r-- 1 hans hans 10490 Jun 3 16:33 logo-gnupg-light-green3-bg (Hans-Christoph Steiner, Jun 3 16h34).png
-rw-r--r-- 1 hans hans 10490 Jun 3 16:34 logo-gnupg-light-green3-bg (Hans-Christoph Steiner, Jun 3 16h35).png
-rw-r--r-- 1 hans hans 10490 Jun 3 16:35 logo-gnupg-light-green3-bg (Hans-Christoph Steiner, Jun 3 16h36).png
-rw-r--r-- 1 hans hans 10490 Jun 3 16:36 logo-gnupg-light-green3-bg (Hans-Christoph Steiner, Jun 3 16h37).png
-rw-r--r-- 1 hans hans 10490 Jun 3 16:37 logo-gnupg-light-green3-bg (Hans-Christoph Steiner, Jun 3 16h38).png
-rw-r--r-- 1 hans hans 10490 Jun 3 16:38 logo-gnupg-light-green3-bg (Hans-Christoph Steiner, Jun 3 16h39).png
-rw-r--r-- 1 hans hans 10490 Jun 3 16:39 logo-gnupg-light-green3-bg (Hans-Christoph Steiner, Jun 3 16h40).png
-rw-r--r-- 1 hans hans 10490 Jun 3 16:40 logo-gnupg-light-green3-bg (Hans-Christoph Steiner, Jun 3 16h41).png
-rw-r--r-- 1 hans hans 10490 Jun 3 16:41 logo-gnupg-light-green3-bg (Hans-Christoph Steiner, Jun 3 16h42).png
-rw-r--r-- 1 hans hans 10490 Jun 3 16:42 logo-gnupg-light-green3-bg (Hans-Christoph Steiner, Jun 3 16h43).png
-rw-r--r-- 1 hans hans 10490 Jun 3 16:43 logo-gnupg-light-green3-bg (Hans-Christoph Steiner, Jun 3 16h44).png
-rw-r--r-- 1 hans hans 10490 Jun 3 16:44 logo-gnupg-light-green3-bg (Hans-Christoph Steiner, Jun 3 16h45).png
-rw-r--r-- 1 hans hans 5675 Jun 3 16:32 logo-gnupg-light-green4-bg (Hans-Christoph Steiner, Jun 3 16h32).png
-rw-r--r-- 1 hans hans 5675 Jun 3 16:32 logo-gnupg-light-green4-bg (Hans-Christoph Steiner, Jun 3 16h33).png
-rw-r--r-- 1 hans hans 5675 Jun 3 16:33 logo-gnupg-light-green4-bg (Hans-Christoph Steiner, Jun 3 16h34).png
-rw-r--r-- 1 hans hans 5675 Jun 3 16:34 logo-gnupg-light-green4-bg (Hans-Christoph Steiner, Jun 3 16h35).png
-rw-r--r-- 1 hans hans 5675 Jun 3 16:35 logo-gnupg-light-green4-bg (Hans-Christoph Steiner, Jun 3 16h36).png
-rw-r--r-- 1 hans hans 5675 Jun 3 16:36 logo-gnupg-light-green4-bg (Hans-Christoph Steiner, Jun 3 16h37).png
-rw-r--r-- 1 hans hans 5675 Jun 3 16:37 logo-gnupg-light-green4-bg (Hans-Christoph Steiner, Jun 3 16h38).png
-rw-r--r-- 1 hans hans 5675 Jun 3 16:38 logo-gnupg-light-green4-bg (Hans-Christoph Steiner, Jun 3 16h39).png
-rw-r--r-- 1 hans hans 5675 Jun 3 16:39 logo-gnupg-light-green4-bg (Hans-Christoph Steiner, Jun 3 16h40).png
-rw-r--r-- 1 hans hans 5675 Jun 3 16:40 logo-gnupg-light-green4-bg (Hans-Christoph Steiner, Jun 3 16h41).png
-rw-r--r-- 1 hans hans 5675 Jun 3 16:41 logo-gnupg-light-green4-bg (Hans-Christoph Steiner, Jun 3 16h42).png
-rw-r--r-- 1 hans hans 5675 Jun 3 16:42 logo-gnupg-light-green4-bg (Hans-Christoph Steiner, Jun 3 16h43).png
-rw-r--r-- 1 hans hans 5675 Jun 3 16:43 logo-gnupg-light-green4-bg (Hans-Christoph Steiner, Jun 3 16h44).png
-rw-r--r-- 1 hans hans 5675 Jun 3 16:44 logo-gnupg-light-green4-bg (Hans-Christoph Steiner, Jun 3 16h45).png
-rw-r--r-- 1 hans hans 7014 Jun 3 16:32 logo-gnupg-light-green-bg (Hans-Christoph Steiner, Jun 3 16h32).png
-rw-r--r-- 1 hans hans 7014 Jun 3 16:32 logo-gnupg-light-green-bg (Hans-Christoph Steiner, Jun 3 16h33).png
-rw-r--r-- 1 hans hans 7014 Jun 3 16:33 logo-gnupg-light-green-bg (Hans-Christoph Steiner, Jun 3 16h34).png
-rw-r--r-- 1 hans hans 7014 Jun 3 16:34 logo-gnupg-light-green-bg (Hans-Christoph Steiner, Jun 3 16h35).png
-rw-r--r-- 1 hans hans 7014 Jun 3 16:35 logo-gnupg-light-green-bg (Hans-Christoph Steiner, Jun 3 16h36).png
-rw-r--r-- 1 hans hans 7014 Jun 3 16:36 logo-gnupg-light-green-bg (Hans-Christoph Steiner, Jun 3 16h37).png
-rw-r--r-- 1 hans hans 7014 Jun 3 16:37 logo-gnupg-light-green-bg (Hans-Christoph Steiner, Jun 3 16h38).png
-rw-r--r-- 1 hans hans 7014 Jun 3 16:38 logo-gnupg-light-green-bg (Hans-Christoph Steiner, Jun 3 16h39).png
-rw-r--r-- 1 hans hans 7014 Jun 3 16:39 logo-gnupg-light-green-bg (Hans-Christoph Steiner, Jun 3 16h40).png
-rw-r--r-- 1 hans hans 7014 Jun 3 16:40 logo-gnupg-light-green-bg (Hans-Christoph Steiner, Jun 3 16h41).png
-rw-r--r-- 1 hans hans 7014 Jun 3 16:41 logo-gnupg-light-green-bg (Hans-Christoph Steiner, Jun 3 16h42).png
-rw-r--r-- 1 hans hans 7014 Jun 3 16:42 logo-gnupg-light-green-bg (Hans-Christoph Steiner, Jun 3 16h43).png
-rw-r--r-- 1 hans hans 7014 Jun 3 16:43 logo-gnupg-light-green-bg (Hans-Christoph Steiner, Jun 3 16h44).png
-rw-r--r-- 1 hans hans 7014 Jun 3 16:44 logo-gnupg-light-green-bg (Hans-Christoph Steiner, Jun 3 16h45).png
-rw-r--r-- 1 hans hans 9024 Jun 3 16:32 logo-gnupg-light-purple-bg (Hans-Christoph Steiner, Jun 3 16h32).png
-rw-r--r-- 1 hans hans 9024 Jun 3 16:32 logo-gnupg-light-purple-bg (Hans-Christoph Steiner, Jun 3 16h33).png
-rw-r--r-- 1 hans hans 9024 Jun 3 16:33 logo-gnupg-light-purple-bg (Hans-Christoph Steiner, Jun 3 16h34).png
-rw-r--r-- 1 hans hans 9024 Jun 3 16:34 logo-gnupg-light-purple-bg (Hans-Christoph Steiner, Jun 3 16h35).png
-rw-r--r-- 1 hans hans 9024 Jun 3 16:35 logo-gnupg-light-purple-bg (Hans-Christoph Steiner, Jun 3 16h36).png
-rw-r--r-- 1 hans hans 9024 Jun 3 16:36 logo-gnupg-light-purple-bg (Hans-Christoph Steiner, Jun 3 16h37).png
-rw-r--r-- 1 hans hans 9024 Jun 3 16:37 logo-gnupg-light-purple-bg (Hans-Christoph Steiner, Jun 3 16h38).png
-rw-r--r-- 1 hans hans 9024 Jun 3 16:38 logo-gnupg-light-purple-bg (Hans-Christoph Steiner, Jun 3 16h39).png
-rw-r--r-- 1 hans hans 9024 Jun 3 16:39 logo-gnupg-light-purple-bg (Hans-Christoph Steiner, Jun 3 16h40).png
-rw-r--r-- 1 hans hans 9024 Jun 3 16:40 logo-gnupg-light-purple-bg (Hans-Christoph Steiner, Jun 3 16h41).png
-rw-r--r-- 1 hans hans 9024 Jun 3 16:41 logo-gnupg-light-purple-bg (Hans-Christoph Steiner, Jun 3 16h42).png
-rw-r--r-- 1 hans hans 9024 Jun 3 16:42 logo-gnupg-light-purple-bg (Hans-Christoph Steiner, Jun 3 16h43).png
-rw-r--r-- 1 hans hans 9024 Jun 3 16:43 logo-gnupg-light-purple-bg (Hans-Christoph Steiner, Jun 3 16h44).png
-rw-r--r-- 1 hans hans 9024 Jun 3 16:44 logo-gnupg-light-purple-bg (Hans-Christoph Steiner, Jun 3 16h45).png
-rw-r--r-- 1 hans hans 80244 Jun 3 16:32 MacGPG_green (Hans-Christoph Steiner, Jun 3 16h32).png
-rw-r--r-- 1 hans hans 80244 Jun 3 16:32 MacGPG_green (Hans-Christoph Steiner, Jun 3 16h33).png
-rw-r--r-- 1 hans hans 80244 Jun 3 16:33 MacGPG_green (Hans-Christoph Steiner, Jun 3 16h34).png
-rw-r--r-- 1 hans hans 80244 Jun 3 16:34 MacGPG_green (Hans-Christoph Steiner, Jun 3 16h35).png
-rw-r--r-- 1 hans hans 80244 Jun 3 16:35 MacGPG_green (Hans-Christoph Steiner, Jun 3 16h36).png
-rw-r--r-- 1 hans hans 80244 Jun 3 16:36 MacGPG_green (Hans-Christoph Steiner, Jun 3 16h37).png
-rw-r--r-- 1 hans hans 80244 Jun 3 16:37 MacGPG_green (Hans-Christoph Steiner, Jun 3 16h38).png
-rw-r--r-- 1 hans hans 80244 Jun 3 16:38 MacGPG_green (Hans-Christoph Steiner, Jun 3 16h39).png
-rw-r--r-- 1 hans hans 80244 Jun 3 16:39 MacGPG_green (Hans-Christoph Steiner, Jun 3 16h40).png
-rw-r--r-- 1 hans hans 80244 Jun 3 16:40 MacGPG_green (Hans-Christoph Steiner, Jun 3 16h41).png
-rw-r--r-- 1 hans hans 80244 Jun 3 16:41 MacGPG_green (Hans-Christoph Steiner, Jun 3 16h42).png
-rw-r--r-- 1 hans hans 80244 Jun 3 16:42 MacGPG_green (Hans-Christoph Steiner, Jun 3 16h43).png
-rw-r--r-- 1 hans hans 80244 Jun 3 16:43 MacGPG_green (Hans-Christoph Steiner, Jun 3 16h44).png
-rw-r--r-- 1 hans hans 80244 Jun 3 16:44 MacGPG_green (Hans-Christoph Steiner, Jun 3 16h45).png
-rw-r--r-- 1 hans hans 19864 Jun 3 16:32 Screen Shot 2013-05-08 at 12.55.41 PM (Hans-Christoph Steiner, Jun 3 16h32).png
-rw-r--r-- 1 hans hans 19864 Jun 3 16:32 Screen Shot 2013-05-08 at 12.55.41 PM (Hans-Christoph Steiner, Jun 3 16h33).png
-rw-r--r-- 1 hans hans 19864 Jun 3 16:33 Screen Shot 2013-05-08 at 12.55.41 PM (Hans-Christoph Steiner, Jun 3 16h34).png
-rw-r--r-- 1 hans hans 19864 Jun 3 16:34 Screen Shot 2013-05-08 at 12.55.41 PM (Hans-Christoph Steiner, Jun 3 16h35).png
-rw-r--r-- 1 hans hans 19864 Jun 3 16:35 Screen Shot 2013-05-08 at 12.55.41 PM (Hans-Christoph Steiner, Jun 3 16h36).png
-rw-r--r-- 1 hans hans 19864 Jun 3 16:36 Screen Shot 2013-05-08 at 12.55.41 PM (Hans-Christoph Steiner, Jun 3 16h37).png
-rw-r--r-- 1 hans hans 19864 Jun 3 16:37 Screen Shot 2013-05-08 at 12.55.41 PM (Hans-Christoph Steiner, Jun 3 16h38).png
-rw-r--r-- 1 hans hans 19864 Jun 3 16:38 Screen Shot 2013-05-08 at 12.55.41 PM (Hans-Christoph Steiner, Jun 3 16h39).png
-rw-r--r-- 1 hans hans 19864 Jun 3 16:39 Screen Shot 2013-05-08 at 12.55.41 PM (Hans-Christoph Steiner, Jun 3 16h40).png
-rw-r--r-- 1 hans hans 19864 Jun 3 16:40 Screen Shot 2013-05-08 at 12.55.41 PM (Hans-Christoph Steiner, Jun 3 16h41).png
-rw-r--r-- 1 hans hans 19864 Jun 3 16:41 Screen Shot 2013-05-08 at 12.55.41 PM (Hans-Christoph Steiner, Jun 3 16h42).png
-rw-r--r-- 1 hans hans 19864 Jun 3 16:42 Screen Shot 2013-05-08 at 12.55.41 PM (Hans-Christoph Steiner, Jun 3 16h43).png
-rw-r--r-- 1 hans hans 19864 Jun 3 16:43 Screen Shot 2013-05-08 at 12.55.41 PM (Hans-Christoph Steiner, Jun 3 16h44).png
-rw-r--r-- 1 hans hans 19864 Jun 3 16:44 Screen Shot 2013-05-08 at 12.55.41 PM (Hans-Christoph Steiner, Jun 3 16h45).png
-rw-r--r-- 1 hans hans 12481 Jun 3 16:32 Screen Shot 2013-05-08 at 12.56.00 PM (Hans-Christoph Steiner, Jun 3 16h32).png
-rw-r--r-- 1 hans hans 12481 Jun 3 16:32 Screen Shot 2013-05-08 at 12.56.00 PM (Hans-Christoph Steiner, Jun 3 16h33).png
-rw-r--r-- 1 hans hans 12481 Jun 3 16:33 Screen Shot 2013-05-08 at 12.56.00 PM (Hans-Christoph Steiner, Jun 3 16h34).png
-rw-r--r-- 1 hans hans 12481 Jun 3 16:34 Screen Shot 2013-05-08 at 12.56.00 PM (Hans-Christoph Steiner, Jun 3 16h35).png
-rw-r--r-- 1 hans hans 12481 Jun 3 16:35 Screen Shot 2013-05-08 at 12.56.00 PM (Hans-Christoph Steiner, Jun 3 16h36).png
-rw-r--r-- 1 hans hans 12481 Jun 3 16:36 Screen Shot 2013-05-08 at 12.56.00 PM (Hans-Christoph Steiner, Jun 3 16h37).png
-rw-r--r-- 1 hans hans 12481 Jun 3 16:37 Screen Shot 2013-05-08 at 12.56.00 PM (Hans-Christoph Steiner, Jun 3 16h38).png
-rw-r--r-- 1 hans hans 12481 Jun 3 16:38 Screen Shot 2013-05-08 at 12.56.00 PM (Hans-Christoph Steiner, Jun 3 16h39).png
-rw-r--r-- 1 hans hans 12481 Jun 3 16:39 Screen Shot 2013-05-08 at 12.56.00 PM (Hans-Christoph Steiner, Jun 3 16h40).png
-rw-r--r-- 1 hans hans 12481 Jun 3 16:40 Screen Shot 2013-05-08 at 12.56.00 PM (Hans-Christoph Steiner, Jun 3 16h41).png
-rw-r--r-- 1 hans hans 12481 Jun 3 16:41 Screen Shot 2013-05-08 at 12.56.00 PM (Hans-Christoph Steiner, Jun 3 16h42).png
-rw-r--r-- 1 hans hans 12481 Jun 3 16:42 Screen Shot 2013-05-08 at 12.56.00 PM (Hans-Christoph Steiner, Jun 3 16h43).png
-rw-r--r-- 1 hans hans 12481 Jun 3 16:43 Screen Shot 2013-05-08 at 12.56.00 PM (Hans-Christoph Steiner, Jun 3 16h44).png
-rw-r--r-- 1 hans hans 12481 Jun 3 16:44 Screen Shot 2013-05-08 at 12.56.00 PM (Hans-Christoph Steiner, Jun 3 16h45).png
-rw-r--r-- 1 hans hans 17474 Jun 3 16:32 skitch (Hans-Christoph Steiner, Jun 3 16h32).png
-rw-r--r-- 1 hans hans 17474 Jun 3 16:32 skitch (Hans-Christoph Steiner, Jun 3 16h33).png
-rw-r--r-- 1 hans hans 17474 Jun 3 16:33 skitch (Hans-Christoph Steiner, Jun 3 16h34).png
-rw-r--r-- 1 hans hans 17474 Jun 3 16:34 skitch (Hans-Christoph Steiner, Jun 3 16h35).png
-rw-r--r-- 1 hans hans 17474 Jun 3 16:35 skitch (Hans-Christoph Steiner, Jun 3 16h36).png
-rw-r--r-- 1 hans hans 17474 Jun 3 16:36 skitch (Hans-Christoph Steiner, Jun 3 16h37).png
-rw-r--r-- 1 hans hans 17474 Jun 3 16:37 skitch (Hans-Christoph Steiner, Jun 3 16h38).png
-rw-r--r-- 1 hans hans 17474 Jun 3 16:38 skitch (Hans-Christoph Steiner, Jun 3 16h39).png
-rw-r--r-- 1 hans hans 17474 Jun 3 16:39 skitch (Hans-Christoph Steiner, Jun 3 16h40).png
-rw-r--r-- 1 hans hans 17474 Jun 3 16:40 skitch (Hans-Christoph Steiner, Jun 3 16h41).png
-rw-r--r-- 1 hans hans 17474 Jun 3 16:41 skitch (Hans-Christoph Steiner, Jun 3 16h42).png
-rw-r--r-- 1 hans hans 17474 Jun 3 16:42 skitch (Hans-Christoph Steiner, Jun 3 16h43).png
-rw-r--r-- 1 hans hans 17474 Jun 3 16:43 skitch (Hans-Christoph Steiner, Jun 3 16h44).png
-rw-r--r-- 1 hans hans 17474 Jun 3 16:44 skitch (Hans-Christoph Steiner, Jun 3 16h45).png
-rw-r--r-- 1 hans hans 429 Apr 11 12:12 SparkleShare.txt
Raw
git-status--porcelain.txt
`git status --porcelain > /tmp/git-status--porcelain.txt`
AU Graphics/gnupg/GPGTools.png
AU Graphics/gnupg/MacGPG_green.png
AU Graphics/gnupg/Screen Shot 2013-05-08 at 12.55.41 PM.png
AU Graphics/gnupg/Screen Shot 2013-05-08 at 12.56.00 PM.png
AU Graphics/gnupg/logo-gnupg-light-green-bg.png
AU Graphics/gnupg/logo-gnupg-light-green2-bg copy.png
AU Graphics/gnupg/logo-gnupg-light-green2-bg.png
AU Graphics/gnupg/logo-gnupg-light-green3-bg.png
AU Graphics/gnupg/logo-gnupg-light-green4-bg.png
AU Graphics/gnupg/logo-gnupg-light-purple-bg.png
AU Graphics/gnupg/skitch.png
DD Guardian Project Graphics/gnupg/GPGTools.png
DD Guardian Project Graphics/gnupg/MacGPG_green.png
DD Guardian Project Graphics/gnupg/Screen Shot 2013-05-08 at 12.55.41 PM.png
DD Guardian Project Graphics/gnupg/Screen Shot 2013-05-08 at 12.56.00 PM.png
UA Guardian Project Graphics/gnupg/gnupg.org/Screen Shot 2013-05-08 at 12.55.41 PM.png
UA Guardian Project Graphics/gnupg/gnupg.org/Screen Shot 2013-05-08 at 12.56.00 PM.png
UA Guardian Project Graphics/gnupg/gnupg.org/logo-gnupg-light-green-bg.png
UA Guardian Project Graphics/gnupg/gnupg.org/logo-gnupg-light-green2-bg copy.png
UA Guardian Project Graphics/gnupg/gnupg.org/logo-gnupg-light-green2-bg.png
UA Guardian Project Graphics/gnupg/gnupg.org/logo-gnupg-light-green3-bg.png
UA Guardian Project Graphics/gnupg/gnupg.org/logo-gnupg-light-green4-bg.png
UA Guardian Project Graphics/gnupg/gnupg.org/logo-gnupg-light-purple-bg.png
UA Guardian Project Graphics/gnupg/gnupg.org/skitch.png
UA Guardian Project Graphics/gnupg/gpgcli.png
R "Guardian Project Graphics/gnupg/GPGTools Icon Set.zip" -> "Guardian Project Graphics/gnupg/gpgtools.org/GPGTools Icon Set.zip"
R "Guardian Project Graphics/gnupg/GPGTools Icon Set/ASC Document/128.psd" -> "Guardian Project Graphics/gnupg/gpgtools.org/GPGTools Icon Set/ASC Document/128.psd"
R "Guardian Project Graphics/gnupg/GPGTools Icon Set/ASC Document/16.psd" -> "Guardian Project Graphics/gnupg/gpgtools.org/GPGTools Icon Set/ASC Document/16.psd"
R "Guardian Project Graphics/gnupg/GPGTools Icon Set/ASC Document/256.psd" -> "Guardian Project Graphics/gnupg/gpgtools.org/GPGTools Icon Set/ASC Document/256.psd"
R "Guardian Project Graphics/gnupg/GPGTools Icon Set/ASC Document/32.psd" -> "Guardian Project Graphics/gnupg/gpgtools.org/GPGTools Icon Set/ASC Document/32.psd"
R "Guardian Project Graphics/gnupg/GPGTools Icon Set/ASC Document/512.psd" -> "Guardian Project Graphics/gnupg/gpgtools.org/GPGTools Icon Set/ASC Document/512.psd"
R "Guardian Project Graphics/gnupg/GPGTools Icon Set/ASC Document/ASC Document.icns" -> "Guardian Project Graphics/gnupg/gpgtools.org/GPGTools Icon Set/ASC Document/ASC Document.icns"
R "Guardian Project Graphics/gnupg/GPGTools Icon Set/ASC Document/Doc.icns" -> "Guardian Project Graphics/gnupg/gpgtools.org/GPGTools Icon Set/ASC Document/Doc.icns"
R "Guardian Project Graphics/gnupg/GPGTools Icon Set/GPGKEY Document/128.psd" -> "Guardian Project Graphics/gnupg/gpgtools.org/GPGTools Icon Set/GPGKEY Document/128.psd"
R "Guardian Project Graphics/gnupg/GPGTools Icon Set/GPGKEY Document/16.psd" -> "Guardian Project Graphics/gnupg/gpgtools.org/GPGTools Icon Set/GPGKEY Document/16.psd"
R "Guardian Project Graphics/gnupg/GPGTools Icon Set/GPGKEY Document/256.psd" -> "Guardian Project Graphics/gnupg/gpgtools.org/GPGTools Icon Set/GPGKEY Document/256.psd"
R "Guardian Project Graphics/gnupg/GPGTools Icon Set/GPGKEY Document/32.psd" -> "Guardian Project Graphics/gnupg/gpgtools.org/GPGTools Icon Set/GPGKEY Document/32.psd"
R "Guardian Project Graphics/gnupg/GPGTools Icon Set/GPGKEY Document/512.psd" -> "Guardian Project Graphics/gnupg/gpgtools.org/GPGTools Icon Set/GPGKEY Document/512.psd"
R "Guardian Project Graphics/gnupg/GPGTools Icon Set/GPGKEY Document/Doc.icns" -> "Guardian Project Graphics/gnupg/gpgtools.org/GPGTools Icon Set/GPGKEY Document/Doc.icns"
R "Guardian Project Graphics/gnupg/GPGTools Icon Set/GPGKeys/!128.psd" -> "Guardian Project Graphics/gnupg/gpgtools.org/GPGTools Icon Set/GPGKeys/!128.psd"
R "Guardian Project Graphics/gnupg/GPGTools Icon Set/GPGKeys/16.psd" -> "Guardian Project Graphics/gnupg/gpgtools.org/GPGTools Icon Set/GPGKeys/16.psd"
R "Guardian Project Graphics/gnupg/GPGTools Icon Set/GPGKeys/32.psd" -> "Guardian Project Graphics/gnupg/gpgtools.org/GPGTools Icon Set/GPGKeys/32.psd"
R "Guardian Project Graphics/gnupg/GPGTools Icon Set/GPGKeys/512.psd" -> "Guardian Project Graphics/gnupg/gpgtools.org/GPGTools Icon Set/GPGKeys/512.psd"
R "Guardian Project Graphics/gnupg/GPGTools Icon Set/GPGKeys/Dokumentmall/128.psd" -> "Guardian Project Graphics/gnupg/gpgtools.org/GPGTools Icon Set/GPGKeys/Dokumentmall/128.psd"
R "Guardian Project Graphics/gnupg/GPGTools Icon Set/GPGKeys/Dokumentmall/16.psd" -> "Guardian Project Graphics/gnupg/gpgtools.org/GPGTools Icon Set/GPGKeys/Dokumentmall/16.psd"
R "Guardian Project Graphics/gnupg/GPGTools Icon Set/GPGKeys/Dokumentmall/256.psd" -> "Guardian Project Graphics/gnupg/gpgtools.org/GPGTools Icon Set/GPGKeys/Dokumentmall/256.psd"
R "Guardian Project Graphics/gnupg/GPGTools Icon Set/GPGKeys/Dokumentmall/32.psd" -> "Guardian Project Graphics/gnupg/gpgtools.org/GPGTools Icon Set/GPGKeys/Dokumentmall/32.psd"
R "Guardian Project Graphics/gnupg/GPGTools Icon Set/GPGKeys/Dokumentmall/512.psd" -> "Guardian Project Graphics/gnupg/gpgtools.org/GPGTools Icon Set/GPGKeys/Dokumentmall/512.psd"
R "Guardian Project Graphics/gnupg/GPGTools Icon Set/GPGKeys/Export.psd" -> "Guardian Project Graphics/gnupg/gpgtools.org/GPGTools Icon Set/GPGKeys/Export.psd"
R "Guardian Project Graphics/gnupg/GPGTools Icon Set/GPGKeys/GPG Keychain Access.icns" -> "Guardian Project Graphics/gnupg/gpgtools.org/GPGTools Icon Set/GPGKeys/GPG Keychain Access.icns"
R "Guardian Project Graphics/gnupg/GPGTools Icon Set/GPGKeys/Import.psd" -> "Guardian Project Graphics/gnupg/gpgtools.org/GPGTools Icon Set/GPGKeys/Import.psd"
R "Guardian Project Graphics/gnupg/GPGTools Icon Set/GPGKeys/Key_Large.tif" -> "Guardian Project Graphics/gnupg/gpgtools.org/GPGTools Icon Set/GPGKeys/Key_Large.tif"
R "Guardian Project Graphics/gnupg/GPGTools Icon Set/GPGKeys/Keychain.icns" -> "Guardian Project Graphics/gnupg/gpgtools.org/GPGTools Icon Set/GPGKeys/Keychain.icns"
R "Guardian Project Graphics/gnupg/GPGTools Icon Set/GPGKeys/PNG/128.png" -> "Guardian Project Graphics/gnupg/gpgtools.org/GPGTools Icon Set/GPGKeys/PNG/128.png"
R "Guardian Project Graphics/gnupg/GPGTools Icon Set/GPGKeys/PNG/16.png" -> "Guardian Project Graphics/gnupg/gpgtools.org/GPGTools Icon Set/GPGKeys/PNG/16.png"
R "Guardian Project Graphics/gnupg/GPGTools Icon Set/GPGKeys/PNG/256.png" -> "Guardian Project Graphics/gnupg/gpgtools.org/GPGTools Icon Set/GPGKeys/PNG/256.png"
R "Guardian Project Graphics/gnupg/GPGTools Icon Set/GPGKeys/PNG/32.png" -> "Guardian Project Graphics/gnupg/gpgtools.org/GPGTools Icon Set/GPGKeys/PNG/32.png"
R "Guardian Project Graphics/gnupg/GPGTools Icon Set/GPGKeys/PNG/512.png" -> "Guardian Project Graphics/gnupg/gpgtools.org/GPGTools Icon Set/GPGKeys/PNG/512.png"
R "Guardian Project Graphics/gnupg/GPGTools Icon Set/GPGKeys/PNG/Export.png" -> "Guardian Project Graphics/gnupg/gpgtools.org/GPGTools Icon Set/GPGKeys/PNG/Export.png"
R "Guardian Project Graphics/gnupg/GPGTools Icon Set/GPGKeys/PNG/Generate.png" -> "Guardian Project Graphics/gnupg/gpgtools.org/GPGTools Icon Set/GPGKeys/PNG/Generate.png"
R "Guardian Project Graphics/gnupg/GPGTools Icon Set/GPGKeys/PNG/Import.png" -> "Guardian Project Graphics/gnupg/gpgtools.org/GPGTools Icon Set/GPGKeys/PNG/Import.png"
R "Guardian Project Graphics/gnupg/GPGTools Icon Set/GPGKeys/PNG/dokument/128 copy.png" -> "Guardian Project Graphics/gnupg/gpgtools.org/GPGTools Icon Set/GPGKeys/PNG/dokument/128 copy.png"
R "Guardian Project Graphics/gnupg/GPGTools Icon Set/GPGKeys/PNG/dokument/16 copy.png" -> "Guardian Project Graphics/gnupg/gpgtools.org/GPGTools Icon Set/GPGKeys/PNG/dokument/16 copy.png"
R "Guardian Project Graphics/gnupg/GPGTools Icon Set/GPGKeys/PNG/dokument/256 copy.png" -> "Guardian Project Graphics/gnupg/gpgtools.org/GPGTools Icon Set/GPGKeys/PNG/dokument/256 copy.png"
R "Guardian Project Graphics/gnupg/GPGTools Icon Set/GPGKeys/PNG/dokument/32 copy.png" -> "Guardian Project Graphics/gnupg/gpgtools.org/GPGTools Icon Set/GPGKeys/PNG/dokument/32 copy.png"
R "Guardian Project Graphics/gnupg/GPGTools Icon Set/GPGKeys/PNG/dokument/512 copy.png" -> "Guardian Project Graphics/gnupg/gpgtools.org/GPGTools Icon Set/GPGKeys/PNG/dokument/512 copy.png"
R "Guardian Project Graphics/gnupg/GPGTools Icon Set/GPGKeys/ct_tb_arrow-down.tiff" -> "Guardian Project Graphics/gnupg/gpgtools.org/GPGTools Icon Set/GPGKeys/ct_tb_arrow-down.tiff"
R "Guardian Project Graphics/gnupg/GPGTools Icon Set/GPGKeys/ct_tb_arrow-up.tiff" -> "Guardian Project Graphics/gnupg/gpgtools.org/GPGTools Icon Set/GPGKeys/ct_tb_arrow-up.tiff"
R "Guardian Project Graphics/gnupg/GPGTools Icon Set/GPGKeys/info.icns" -> "Guardian Project Graphics/gnupg/gpgtools.org/GPGTools Icon Set/GPGKeys/info.icns"
R "Guardian Project Graphics/gnupg/GPGTools Icon Set/GPGMail/GPGMail 128.psd" -> "Guardian Project Graphics/gnupg/gpgtools.org/GPGTools Icon Set/GPGMail/GPGMail 128.psd"
R "Guardian Project Graphics/gnupg/GPGTools Icon Set/GPGMail/GPGMail 16.psd" -> "Guardian Project Graphics/gnupg/gpgtools.org/GPGTools Icon Set/GPGMail/GPGMail 16.psd"
R "Guardian Project Graphics/gnupg/GPGTools Icon Set/GPGMail/GPGMail 256.psd" -> "Guardian Project Graphics/gnupg/gpgtools.org/GPGTools Icon Set/GPGMail/GPGMail 256.psd"
R "Guardian Project Graphics/gnupg/GPGTools Icon Set/GPGMail/GPGMail 32.psd" -> "Guardian Project Graphics/gnupg/gpgtools.org/GPGTools Icon Set/GPGMail/GPGMail 32.psd"
R "Guardian Project Graphics/gnupg/GPGTools Icon Set/GPGMail/GPGMail 512.psd" -> "Guardian Project Graphics/gnupg/gpgtools.org/GPGTools Icon Set/GPGMail/GPGMail 512.psd"
R "Guardian Project Graphics/gnupg/GPGTools Icon Set/GPGMail/GPGMail web logo.psd" -> "Guardian Project Graphics/gnupg/gpgtools.org/GPGTools Icon Set/GPGMail/GPGMail web logo.psd"
R "Guardian Project Graphics/gnupg/GPGTools Icon Set/GPGMail/GPGMail.icns" -> "Guardian Project Graphics/gnupg/gpgtools.org/GPGTools Icon Set/GPGMail/GPGMail.icns"
R "Guardian Project Graphics/gnupg/GPGTools Icon Set/GPGMail/app.icns" -> "Guardian Project Graphics/gnupg/gpgtools.org/GPGTools Icon Set/GPGMail/app.icns"
R "Guardian Project Graphics/gnupg/GPGTools Icon Set/INSTALLER/Installer.icns" -> "Guardian Project Graphics/gnupg/gpgtools.org/GPGTools Icon Set/INSTALLER/Installer.icns"
R "Guardian Project Graphics/gnupg/GPGTools Icon Set/MacGPG/GnuPG-Logo.png" -> "Guardian Project Graphics/gnupg/gpgtools.org/GPGTools Icon Set/MacGPG/GnuPG-Logo.png"
R "Guardian Project Graphics/gnupg/GPGTools Icon Set/MacGPG/Logo with text.psd" -> "Guardian Project Graphics/gnupg/gpgtools.org/GPGTools Icon Set/MacGPG/Logo with text.psd"
R "Guardian Project Graphics/gnupg/GPGTools Icon Set/MacGPG/MacGPG.icns" -> "Guardian Project Graphics/gnupg/gpgtools.org/GPGTools Icon Set/MacGPG/MacGPG.icns"
R "Guardian Project Graphics/gnupg/GPGTools Icon Set/MacGPG/Padlock.psd" -> "Guardian Project Graphics/gnupg/gpgtools.org/GPGTools Icon Set/MacGPG/Padlock.psd"
R "Guardian Project Graphics/gnupg/GPGTools Icon Set/MacGPG/SmallAlert5.tiff" -> "Guardian Project Graphics/gnupg/gpgtools.org/GPGTools Icon Set/MacGPG/SmallAlert5.tiff"
R "Guardian Project Graphics/gnupg/GPGTools Icon Set/PNGs/128/ASC Document.png" -> "Guardian Project Graphics/gnupg/gpgtools.org/GPGTools Icon Set/PNGs/128/ASC Document.png"
R "Guardian Project Graphics/gnupg/GPGTools Icon Set/PNGs/128/GPG Keychain Access.png" -> "Guardian Project Graphics/gnupg/gpgtools.org/GPGTools Icon Set/PNGs/128/GPG Keychain Access.png"
R "Guardian Project Graphics/gnupg/GPGTools Icon Set/PNGs/128/GPGMail.png" -> "Guardian Project Graphics/gnupg/gpgtools.org/GPGTools Icon Set/PNGs/128/GPGMail.png"
R "Guardian Project Graphics/gnupg/GPGTools Icon Set/PNGs/128/Installer.png" -> "Guardian Project Graphics/gnupg/gpgtools.org/GPGTools Icon Set/PNGs/128/Installer.png"
R "Guardian Project Graphics/gnupg/GPGTools Icon Set/PNGs/128/MacGPG.png" -> "Guardian Project Graphics/gnupg/gpgtools.org/GPGTools Icon Set/PNGs/128/MacGPG.png"
R "Guardian Project Graphics/gnupg/GPGTools Icon Set/PNGs/16/ASC Document.png" -> "Guardian Project Graphics/gnupg/gpgtools.org/GPGTools Icon Set/PNGs/16/ASC Document.png"
R "Guardian Project Graphics/gnupg/GPGTools Icon Set/PNGs/16/GPG Keychain Access.png" -> "Guardian Project Graphics/gnupg/gpgtools.org/GPGTools Icon Set/PNGs/16/GPG Keychain Access.png"
R "Guardian Project Graphics/gnupg/GPGTools Icon Set/PNGs/16/GPGMail.png" -> "Guardian Project Graphics/gnupg/gpgtools.org/GPGTools Icon Set/PNGs/16/GPGMail.png"
R "Guardian Project Graphics/gnupg/GPGTools Icon Set/PNGs/16/Installer.png" -> "Guardian Project Graphics/gnupg/gpgtools.org/GPGTools Icon Set/PNGs/16/Installer.png"
R "Guardian Project Graphics/gnupg/GPGTools Icon Set/PNGs/16/MacGPG.png" -> "Guardian Project Graphics/gnupg/gpgtools.org/GPGTools Icon Set/PNGs/16/MacGPG.png"
R "Guardian Project Graphics/gnupg/GPGTools Icon Set/PNGs/24/ASC Document.png" -> "Guardian Project Graphics/gnupg/gpgtools.org/GPGTools Icon Set/PNGs/24/ASC Document.png"
R "Guardian Project Graphics/gnupg/GPGTools Icon Set/PNGs/24/GPG Keychain Access.png" -> "Guardian Project Graphics/gnupg/gpgtools.org/GPGTools Icon Set/PNGs/24/GPG Keychain Access.png"
R "Guardian Project Graphics/gnupg/GPGTools Icon Set/PNGs/24/GPGMail.png" -> "Guardian Project Graphics/gnupg/gpgtools.org/GPGTools Icon Set/PNGs/24/GPGMail.png"
R "Guardian Project Graphics/gnupg/GPGTools Icon Set/PNGs/24/Installer.png" -> "Guardian Project Graphics/gnupg/gpgtools.org/GPGTools Icon Set/PNGs/24/Installer.png"
R "Guardian Project Graphics/gnupg/GPGTools Icon Set/PNGs/24/MacGPG.png" -> "Guardian Project Graphics/gnupg/gpgtools.org/GPGTools Icon Set/PNGs/24/MacGPG.png"
R "Guardian Project Graphics/gnupg/GPGTools Icon Set/PNGs/256/ASC Document.png" -> "Guardian Project Graphics/gnupg/gpgtools.org/GPGTools Icon Set/PNGs/256/ASC Document.png"
R "Guardian Project Graphics/gnupg/GPGTools Icon Set/PNGs/256/GPG Keychain Access.png" -> "Guardian Project Graphics/gnupg/gpgtools.org/GPGTools Icon Set/PNGs/256/GPG Keychain Access.png"
R "Guardian Project Graphics/gnupg/GPGTools Icon Set/PNGs/256/GPGMail.png" -> "Guardian Project Graphics/gnupg/gpgtools.org/GPGTools Icon Set/PNGs/256/GPGMail.png"
R "Guardian Project Graphics/gnupg/GPGTools Icon Set/PNGs/256/Installer.png" -> "Guardian Project Graphics/gnupg/gpgtools.org/GPGTools Icon Set/PNGs/256/Installer.png"
R "Guardian Project Graphics/gnupg/GPGTools Icon Set/PNGs/256/MacGPG.png" -> "Guardian Project Graphics/gnupg/gpgtools.org/GPGTools Icon Set/PNGs/256/MacGPG.png"
R "Guardian Project Graphics/gnupg/GPGTools Icon Set/PNGs/32/ASC Document.png" -> "Guardian Project Graphics/gnupg/gpgtools.org/GPGTools Icon Set/PNGs/32/ASC Document.png"
R "Guardian Project Graphics/gnupg/GPGTools Icon Set/PNGs/32/GPG Keychain Access.png" -> "Guardian Project Graphics/gnupg/gpgtools.org/GPGTools Icon Set/PNGs/32/GPG Keychain Access.png"
R "Guardian Project Graphics/gnupg/GPGTools Icon Set/PNGs/32/GPGMail.png" -> "Guardian Project Graphics/gnupg/gpgtools.org/GPGTools Icon Set/PNGs/32/GPGMail.png"
R "Guardian Project Graphics/gnupg/GPGTools Icon Set/PNGs/32/Installer.png" -> "Guardian Project Graphics/gnupg/gpgtools.org/GPGTools Icon Set/PNGs/32/Installer.png"
R "Guardian Project Graphics/gnupg/GPGTools Icon Set/PNGs/32/MacGPG.png" -> "Guardian Project Graphics/gnupg/gpgtools.org/GPGTools Icon Set/PNGs/32/MacGPG.png"
R "Guardian Project Graphics/gnupg/GPGTools Icon Set/PNGs/48/ASC Document.png" -> "Guardian Project Graphics/gnupg/gpgtools.org/GPGTools Icon Set/PNGs/48/ASC Document.png"
R "Guardian Project Graphics/gnupg/GPGTools Icon Set/PNGs/48/GPG Keychain Access.png" -> "Guardian Project Graphics/gnupg/gpgtools.org/GPGTools Icon Set/PNGs/48/GPG Keychain Access.png"
R "Guardian Project Graphics/gnupg/GPGTools Icon Set/PNGs/48/GPGMail.png" -> "Guardian Project Graphics/gnupg/gpgtools.org/GPGTools Icon Set/PNGs/48/GPGMail.png"
R "Guardian Project Graphics/gnupg/GPGTools Icon Set/PNGs/48/Installer.png" -> "Guardian Project Graphics/gnupg/gpgtools.org/GPGTools Icon Set/PNGs/48/Installer.png"
R "Guardian Project Graphics/gnupg/GPGTools Icon Set/PNGs/48/MacGPG.png" -> "Guardian Project Graphics/gnupg/gpgtools.org/GPGTools Icon Set/PNGs/48/MacGPG.png"
R "Guardian Project Graphics/gnupg/GPGTools Icon Set/PNGs/512/ASC Document.png" -> "Guardian Project Graphics/gnupg/gpgtools.org/GPGTools Icon Set/PNGs/512/ASC Document.png"
R "Guardian Project Graphics/gnupg/GPGTools Icon Set/PNGs/512/GPG Keychain Access.png" -> "Guardian Project Graphics/gnupg/gpgtools.org/GPGTools Icon Set/PNGs/512/GPG Keychain Access.png"
R "Guardian Project Graphics/gnupg/GPGTools Icon Set/PNGs/512/GPGMail.png" -> "Guardian Project Graphics/gnupg/gpgtools.org/GPGTools Icon Set/PNGs/512/GPGMail.png"
R "Guardian Project Graphics/gnupg/GPGTools Icon Set/PNGs/512/Installer.png" -> "Guardian Project Graphics/gnupg/gpgtools.org/GPGTools Icon Set/PNGs/512/Installer.png"
R "Guardian Project Graphics/gnupg/GPGTools Icon Set/PNGs/512/MacGPG.png" -> "Guardian Project Graphics/gnupg/gpgtools.org/GPGTools Icon Set/PNGs/512/MacGPG.png"
R "Guardian Project Graphics/gnupg/GPGTools Icon Set/PNGs/64/ASC Document.png" -> "Guardian Project Graphics/gnupg/gpgtools.org/GPGTools Icon Set/PNGs/64/ASC Document.png"
R "Guardian Project Graphics/gnupg/GPGTools Icon Set/PNGs/64/GPG Keychain Access.png" -> "Guardian Project Graphics/gnupg/gpgtools.org/GPGTools Icon Set/PNGs/64/GPG Keychain Access.png"
R "Guardian Project Graphics/gnupg/GPGTools Icon Set/PNGs/64/GPGMail.png" -> "Guardian Project Graphics/gnupg/gpgtools.org/GPGTools Icon Set/PNGs/64/GPGMail.png"
R "Guardian Project Graphics/gnupg/GPGTools Icon Set/PNGs/64/Installer.png" -> "Guardian Project Graphics/gnupg/gpgtools.org/GPGTools Icon Set/PNGs/64/Installer.png"
R "Guardian Project Graphics/gnupg/GPGTools Icon Set/PNGs/64/MacGPG.png" -> "Guardian Project Graphics/gnupg/gpgtools.org/GPGTools Icon Set/PNGs/64/MacGPG.png"
UA Guardian Project Graphics/gnupg/gpgtools.org/GPGTools.png
DD Guardian Project Graphics/gnupg/logo-gnupg-light-green-bg.png
DD Guardian Project Graphics/gnupg/logo-gnupg-light-green2-bg copy.png
DD Guardian Project Graphics/gnupg/logo-gnupg-light-green2-bg.png
DD Guardian Project Graphics/gnupg/logo-gnupg-light-green3-bg.png
DD Guardian Project Graphics/gnupg/logo-gnupg-light-green4-bg.png
DD Guardian Project Graphics/gnupg/logo-gnupg-light-purple-bg.png
DD Guardian Project Graphics/gnupg/skitch.png
?? GPGTools (Hans-Christoph Steiner, Jun 3 16h32).png
?? GPGTools (Hans-Christoph Steiner, Jun 3 16h33).png
?? GPGTools (Hans-Christoph Steiner, Jun 3 16h34).png
?? GPGTools (Hans-Christoph Steiner, Jun 3 16h35).png
?? GPGTools (Hans-Christoph Steiner, Jun 3 16h36).png
?? GPGTools (Hans-Christoph Steiner, Jun 3 16h37).png
?? GPGTools (Hans-Christoph Steiner, Jun 3 16h38).png
?? GPGTools (Hans-Christoph Steiner, Jun 3 16h39).png
?? GPGTools (Hans-Christoph Steiner, Jun 3 16h40).png
?? GPGTools (Hans-Christoph Steiner, Jun 3 16h41).png
?? GPGTools (Hans-Christoph Steiner, Jun 3 16h42).png
?? GPGTools (Hans-Christoph Steiner, Jun 3 16h43).png
?? GPGTools (Hans-Christoph Steiner, Jun 3 16h44).png
?? GPGTools (Hans-Christoph Steiner, Jun 3 16h45).png
?? MacGPG_green (Hans-Christoph Steiner, Jun 3 16h32).png
?? MacGPG_green (Hans-Christoph Steiner, Jun 3 16h33).png
?? MacGPG_green (Hans-Christoph Steiner, Jun 3 16h34).png
?? MacGPG_green (Hans-Christoph Steiner, Jun 3 16h35).png
?? MacGPG_green (Hans-Christoph Steiner, Jun 3 16h36).png
?? MacGPG_green (Hans-Christoph Steiner, Jun 3 16h37).png
?? MacGPG_green (Hans-Christoph Steiner, Jun 3 16h38).png
?? MacGPG_green (Hans-Christoph Steiner, Jun 3 16h39).png
?? MacGPG_green (Hans-Christoph Steiner, Jun 3 16h40).png
?? MacGPG_green (Hans-Christoph Steiner, Jun 3 16h41).png
?? MacGPG_green (Hans-Christoph Steiner, Jun 3 16h42).png
?? MacGPG_green (Hans-Christoph Steiner, Jun 3 16h43).png
?? MacGPG_green (Hans-Christoph Steiner, Jun 3 16h44).png
?? MacGPG_green (Hans-Christoph Steiner, Jun 3 16h45).png
?? Screen Shot 2013-05-08 at 12.55.41 PM (Hans-Christoph Steiner, Jun 3 16h32).png
?? Screen Shot 2013-05-08 at 12.55.41 PM (Hans-Christoph Steiner, Jun 3 16h33).png
?? Screen Shot 2013-05-08 at 12.55.41 PM (Hans-Christoph Steiner, Jun 3 16h34).png
?? Screen Shot 2013-05-08 at 12.55.41 PM (Hans-Christoph Steiner, Jun 3 16h35).png
?? Screen Shot 2013-05-08 at 12.55.41 PM (Hans-Christoph Steiner, Jun 3 16h36).png
?? Screen Shot 2013-05-08 at 12.55.41 PM (Hans-Christoph Steiner, Jun 3 16h37).png
?? Screen Shot 2013-05-08 at 12.55.41 PM (Hans-Christoph Steiner, Jun 3 16h38).png
?? Screen Shot 2013-05-08 at 12.55.41 PM (Hans-Christoph Steiner, Jun 3 16h39).png
?? Screen Shot 2013-05-08 at 12.55.41 PM (Hans-Christoph Steiner, Jun 3 16h40).png
?? Screen Shot 2013-05-08 at 12.55.41 PM (Hans-Christoph Steiner, Jun 3 16h41).png
?? Screen Shot 2013-05-08 at 12.55.41 PM (Hans-Christoph Steiner, Jun 3 16h42).png
?? Screen Shot 2013-05-08 at 12.55.41 PM (Hans-Christoph Steiner, Jun 3 16h43).png
?? Screen Shot 2013-05-08 at 12.55.41 PM (Hans-Christoph Steiner, Jun 3 16h44).png
?? Screen Shot 2013-05-08 at 12.55.41 PM (Hans-Christoph Steiner, Jun 3 16h45).png
?? Screen Shot 2013-05-08 at 12.56.00 PM (Hans-Christoph Steiner, Jun 3 16h32).png
?? Screen Shot 2013-05-08 at 12.56.00 PM (Hans-Christoph Steiner, Jun 3 16h33).png
?? Screen Shot 2013-05-08 at 12.56.00 PM (Hans-Christoph Steiner, Jun 3 16h34).png
?? Screen Shot 2013-05-08 at 12.56.00 PM (Hans-Christoph Steiner, Jun 3 16h35).png
?? Screen Shot 2013-05-08 at 12.56.00 PM (Hans-Christoph Steiner, Jun 3 16h36).png
?? Screen Shot 2013-05-08 at 12.56.00 PM (Hans-Christoph Steiner, Jun 3 16h37).png
?? Screen Shot 2013-05-08 at 12.56.00 PM (Hans-Christoph Steiner, Jun 3 16h38).png
?? Screen Shot 2013-05-08 at 12.56.00 PM (Hans-Christoph Steiner, Jun 3 16h39).png
?? Screen Shot 2013-05-08 at 12.56.00 PM (Hans-Christoph Steiner, Jun 3 16h40).png
?? Screen Shot 2013-05-08 at 12.56.00 PM (Hans-Christoph Steiner, Jun 3 16h41).png
?? Screen Shot 2013-05-08 at 12.56.00 PM (Hans-Christoph Steiner, Jun 3 16h42).png
?? Screen Shot 2013-05-08 at 12.56.00 PM (Hans-Christoph Steiner, Jun 3 16h43).png
?? Screen Shot 2013-05-08 at 12.56.00 PM (Hans-Christoph Steiner, Jun 3 16h44).png
?? Screen Shot 2013-05-08 at 12.56.00 PM (Hans-Christoph Steiner, Jun 3 16h45).png
?? logo-gnupg-light-green-bg (Hans-Christoph Steiner, Jun 3 16h32).png
?? logo-gnupg-light-green-bg (Hans-Christoph Steiner, Jun 3 16h33).png
?? logo-gnupg-light-green-bg (Hans-Christoph Steiner, Jun 3 16h34).png
?? logo-gnupg-light-green-bg (Hans-Christoph Steiner, Jun 3 16h35).png
?? logo-gnupg-light-green-bg (Hans-Christoph Steiner, Jun 3 16h36).png
?? logo-gnupg-light-green-bg (Hans-Christoph Steiner, Jun 3 16h37).png
?? logo-gnupg-light-green-bg (Hans-Christoph Steiner, Jun 3 16h38).png
?? logo-gnupg-light-green-bg (Hans-Christoph Steiner, Jun 3 16h39).png
?? logo-gnupg-light-green-bg (Hans-Christoph Steiner, Jun 3 16h40).png
?? logo-gnupg-light-green-bg (Hans-Christoph Steiner, Jun 3 16h41).png
?? logo-gnupg-light-green-bg (Hans-Christoph Steiner, Jun 3 16h42).png
?? logo-gnupg-light-green-bg (Hans-Christoph Steiner, Jun 3 16h43).png
?? logo-gnupg-light-green-bg (Hans-Christoph Steiner, Jun 3 16h44).png
?? logo-gnupg-light-green-bg (Hans-Christoph Steiner, Jun 3 16h45).png
?? logo-gnupg-light-green2-bg (Hans-Christoph Steiner, Jun 3 16h32).png
?? logo-gnupg-light-green2-bg (Hans-Christoph Steiner, Jun 3 16h33).png
?? logo-gnupg-light-green2-bg (Hans-Christoph Steiner, Jun 3 16h34).png
?? logo-gnupg-light-green2-bg (Hans-Christoph Steiner, Jun 3 16h35).png
?? logo-gnupg-light-green2-bg (Hans-Christoph Steiner, Jun 3 16h36).png
?? logo-gnupg-light-green2-bg (Hans-Christoph Steiner, Jun 3 16h37).png
?? logo-gnupg-light-green2-bg (Hans-Christoph Steiner, Jun 3 16h38).png
?? logo-gnupg-light-green2-bg (Hans-Christoph Steiner, Jun 3 16h39).png
?? logo-gnupg-light-green2-bg (Hans-Christoph Steiner, Jun 3 16h40).png
?? logo-gnupg-light-green2-bg (Hans-Christoph Steiner, Jun 3 16h41).png
?? logo-gnupg-light-green2-bg (Hans-Christoph Steiner, Jun 3 16h42).png
?? logo-gnupg-light-green2-bg (Hans-Christoph Steiner, Jun 3 16h43).png
?? logo-gnupg-light-green2-bg (Hans-Christoph Steiner, Jun 3 16h44).png
?? logo-gnupg-light-green2-bg (Hans-Christoph Steiner, Jun 3 16h45).png
?? logo-gnupg-light-green2-bg copy (Hans-Christoph Steiner, Jun 3 16h32).png
?? logo-gnupg-light-green2-bg copy (Hans-Christoph Steiner, Jun 3 16h33).png
?? logo-gnupg-light-green2-bg copy (Hans-Christoph Steiner, Jun 3 16h34).png
?? logo-gnupg-light-green2-bg copy (Hans-Christoph Steiner, Jun 3 16h35).png
?? logo-gnupg-light-green2-bg copy (Hans-Christoph Steiner, Jun 3 16h36).png
?? logo-gnupg-light-green2-bg copy (Hans-Christoph Steiner, Jun 3 16h37).png
?? logo-gnupg-light-green2-bg copy (Hans-Christoph Steiner, Jun 3 16h38).png
?? logo-gnupg-light-green2-bg copy (Hans-Christoph Steiner, Jun 3 16h39).png
?? logo-gnupg-light-green2-bg copy (Hans-Christoph Steiner, Jun 3 16h40).png
?? logo-gnupg-light-green2-bg copy (Hans-Christoph Steiner, Jun 3 16h41).png
?? logo-gnupg-light-green2-bg copy (Hans-Christoph Steiner, Jun 3 16h42).png
?? logo-gnupg-light-green2-bg copy (Hans-Christoph Steiner, Jun 3 16h43).png
?? logo-gnupg-light-green2-bg copy (Hans-Christoph Steiner, Jun 3 16h44).png
?? logo-gnupg-light-green2-bg copy (Hans-Christoph Steiner, Jun 3 16h45).png
?? logo-gnupg-light-green3-bg (Hans-Christoph Steiner, Jun 3 16h32).png
?? logo-gnupg-light-green3-bg (Hans-Christoph Steiner, Jun 3 16h33).png
?? logo-gnupg-light-green3-bg (Hans-Christoph Steiner, Jun 3 16h34).png
?? logo-gnupg-light-green3-bg (Hans-Christoph Steiner, Jun 3 16h35).png
?? logo-gnupg-light-green3-bg (Hans-Christoph Steiner, Jun 3 16h36).png
?? logo-gnupg-light-green3-bg (Hans-Christoph Steiner, Jun 3 16h37).png
?? logo-gnupg-light-green3-bg (Hans-Christoph Steiner, Jun 3 16h38).png
?? logo-gnupg-light-green3-bg (Hans-Christoph Steiner, Jun 3 16h39).png
?? logo-gnupg-light-green3-bg (Hans-Christoph Steiner, Jun 3 16h40).png
?? logo-gnupg-light-green3-bg (Hans-Christoph Steiner, Jun 3 16h41).png
?? logo-gnupg-light-green3-bg (Hans-Christoph Steiner, Jun 3 16h42).png
?? logo-gnupg-light-green3-bg (Hans-Christoph Steiner, Jun 3 16h43).png
?? logo-gnupg-light-green3-bg (Hans-Christoph Steiner, Jun 3 16h44).png
?? logo-gnupg-light-green3-bg (Hans-Christoph Steiner, Jun 3 16h45).png
?? logo-gnupg-light-green4-bg (Hans-Christoph Steiner, Jun 3 16h32).png
?? logo-gnupg-light-green4-bg (Hans-Christoph Steiner, Jun 3 16h33).png
?? logo-gnupg-light-green4-bg (Hans-Christoph Steiner, Jun 3 16h34).png
?? logo-gnupg-light-green4-bg (Hans-Christoph Steiner, Jun 3 16h35).png
?? logo-gnupg-light-green4-bg (Hans-Christoph Steiner, Jun 3 16h36).png
?? logo-gnupg-light-green4-bg (Hans-Christoph Steiner, Jun 3 16h37).png
?? logo-gnupg-light-green4-bg (Hans-Christoph Steiner, Jun 3 16h38).png
?? logo-gnupg-light-green4-bg (Hans-Christoph Steiner, Jun 3 16h39).png
?? logo-gnupg-light-green4-bg (Hans-Christoph Steiner, Jun 3 16h40).png
?? logo-gnupg-light-green4-bg (Hans-Christoph Steiner, Jun 3 16h41).png
?? logo-gnupg-light-green4-bg (Hans-Christoph Steiner, Jun 3 16h42).png
?? logo-gnupg-light-green4-bg (Hans-Christoph Steiner, Jun 3 16h43).png
?? logo-gnupg-light-green4-bg (Hans-Christoph Steiner, Jun 3 16h44).png
?? logo-gnupg-light-green4-bg (Hans-Christoph Steiner, Jun 3 16h45).png
?? logo-gnupg-light-purple-bg (Hans-Christoph Steiner, Jun 3 16h32).png
?? logo-gnupg-light-purple-bg (Hans-Christoph Steiner, Jun 3 16h33).png
?? logo-gnupg-light-purple-bg (Hans-Christoph Steiner, Jun 3 16h34).png
?? logo-gnupg-light-purple-bg (Hans-Christoph Steiner, Jun 3 16h35).png
?? logo-gnupg-light-purple-bg (Hans-Christoph Steiner, Jun 3 16h36).png
?? logo-gnupg-light-purple-bg (Hans-Christoph Steiner, Jun 3 16h37).png
?? logo-gnupg-light-purple-bg (Hans-Christoph Steiner, Jun 3 16h38).png
?? logo-gnupg-light-purple-bg (Hans-Christoph Steiner, Jun 3 16h39).png
?? logo-gnupg-light-purple-bg (Hans-Christoph Steiner, Jun 3 16h40).png
?? logo-gnupg-light-purple-bg (Hans-Christoph Steiner, Jun 3 16h41).png
?? logo-gnupg-light-purple-bg (Hans-Christoph Steiner, Jun 3 16h42).png
?? logo-gnupg-light-purple-bg (Hans-Christoph Steiner, Jun 3 16h43).png
?? logo-gnupg-light-purple-bg (Hans-Christoph Steiner, Jun 3 16h44).png
?? logo-gnupg-light-purple-bg (Hans-Christoph Steiner, Jun 3 16h45).png
?? skitch (Hans-Christoph Steiner, Jun 3 16h32).png
?? skitch (Hans-Christoph Steiner, Jun 3 16h33).png
?? skitch (Hans-Christoph Steiner, Jun 3 16h34).png
?? skitch (Hans-Christoph Steiner, Jun 3 16h35).png
?? skitch (Hans-Christoph Steiner, Jun 3 16h36).png
?? skitch (Hans-Christoph Steiner, Jun 3 16h37).png
?? skitch (Hans-Christoph Steiner, Jun 3 16h38).png
?? skitch (Hans-Christoph Steiner, Jun 3 16h39).png
?? skitch (Hans-Christoph Steiner, Jun 3 16h40).png
?? skitch (Hans-Christoph Steiner, Jun 3 16h41).png
?? skitch (Hans-Christoph Steiner, Jun 3 16h42).png
?? skitch (Hans-Christoph Steiner, Jun 3 16h43).png
?? skitch (Hans-Christoph Steiner, Jun 3 16h44).png
?? skitch (Hans-Christoph Steiner, Jun 3 16h45).png
Raw
sparkleshare.txt
`mono /usr/local/lib/sparkleshare/SparkleShare.exe > /tmp/sparkleshare.log 2>&1`
16:51:12 | Auth | Imported key '/home/hans/.config/sparkleshare/2013-04-11_11h51.key'
16:51:12 | Auth | The following keys may be used:
2048 b3:0e:f3:32:cb:4a:9c:7b:a6:c3:42:85:86:6e:34:73 /home/hans/.config/sparkleshare/2013-04-11_11h51.key (RSA)
4096 c2:c3:fd:6f:06:3b:37:57:6a:90:53:53:50:01:9d:84 /home/hans/.ssh/id_rsa (RSA)
1024 bb:90:75:c8:c1:da:80:08:17:58:4e:d2:25:54:94:de /home/hans/.ssh/id_dsa (DSA)
16:51:12 | /home/hans/SparkleShare/GPSecureShare | Initializing...
16:51:12 | Cmd | GPSecureShare | git log --since=1.month --raw --find-renames --date=iso --format=medium --no-color --no-merges
16:51:12 | Cmd | GPSecureShare | git config core.ignorecase false
16:51:12 | Cmd | GPSecureShare | git config --get filter.bin.clean
16:51:12 | Cmd | GPSecureShare | git config remote.origin.url "ssh://[email protected]/git/GPSecureShare"
16:51:12 | ListenerFactory | Issued new listener for tcp://notifications.sparkleshare.org:443/
16:51:12 | /home/hans/SparkleShare/GuardianProjectPublic | Initializing...
16:51:12 | Cmd | GuardianProjectPublic | git log --since=1.month --raw --find-renames --date=iso --format=medium --no-color --no-merges
16:51:12 | Git | GPSecureShare | Checking for remote changes...
16:51:12 | Cmd | GPSecureShare | git rev-parse HEAD
16:51:12 | Cmd | GPSecureShare | git rev-parse --abbrev-ref HEAD
16:51:12 | Cmd | GPSecureShare | git ls-remote --heads --exit-code "ssh://[email protected]/git/GPSecureShare" master
16:51:12 | Listener | Subscribing to channel 2d703da0353d5551c615dd9d50197759115d6591 on tcp://notifications.sparkleshare.org:443/
16:51:12 | Listener | Listening for announcements on tcp://notifications.sparkleshare.org:443/
16:51:12 | ListenerFactory | Refered to existing listener for tcp://notifications.sparkleshare.org:443/
16:51:12 | Cmd | GuardianProjectPublic | git config core.ignorecase false
16:51:12 | Listener | Subscribing to channel 3bacdc2fe6448a0bf51154774b29a3e07fff41f5 on tcp://notifications.sparkleshare.org:443/
16:51:12 | Cmd | GuardianProjectPublic | git config --get filter.bin.clean
16:51:12 | Cmd | GuardianProjectPublic | git config remote.origin.url "ssh://[email protected]/guardianproject/GuardianProjectPublic"
16:51:12 | Git | GuardianProjectPublic | Checking for remote changes...
16:51:12 | Cmd | GuardianProjectPublic | git rev-parse HEAD
16:51:13 | Cmd | GuardianProjectPublic | git status --porcelain
16:51:13 | Cmd | GuardianProjectPublic | git status --porcelain
16:51:13 | Git | GuardianProjectPublic | Conflict type: AU Graphics/gnupg/GPGTools.png
16:51:13 | Cmd | GuardianProjectPublic | git checkout --theirs "Graphics/gnupg/GPGTools.png"
error: path 'Graphics/gnupg/GPGTools.png' does not have their version
16:51:13 | Git | GuardianProjectPublic | Failed to resolve conflict, trying again...: Win32 IO returned ERROR_ALREADY_EXISTS. Path: at System.IO.File.Move (System.String sourceFileName, System.String destFileName) [0x00000] in <filename unknown>:0
at SparkleLib.Git.SparkleRepo.ResolveConflict () [0x00000] in <filename unknown>:0
at SparkleLib.Git.SparkleRepo.get_branch () [0x00000] in <filename unknown>:0
16:51:13 | Cmd | GuardianProjectPublic | git status --porcelain
16:51:13 | Cmd | GuardianProjectPublic | git status --porcelain
16:51:13 | Git | GuardianProjectPublic | Conflict type: AU Graphics/gnupg/GPGTools.png
16:51:13 | Cmd | GuardianProjectPublic | git checkout --theirs "Graphics/gnupg/GPGTools.png"
error: path 'Graphics/gnupg/GPGTools.png' does not have their version
16:51:13 | Git | GuardianProjectPublic | Failed to resolve conflict, trying again...: Win32 IO returned ERROR_ALREADY_EXISTS. Path: at System.IO.File.Move (System.String sourceFileName, System.String destFileName) [0x00000] in <filename unknown>:0
at SparkleLib.Git.SparkleRepo.ResolveConflict () [0x00000] in <filename unknown>:0
at SparkleLib.Git.SparkleRepo.get_branch () [0x00000] in <filename unknown>:0
16:51:13 | Cmd | GuardianProjectPublic | git status --porcelain
16:51:13 | Cmd | GuardianProjectPublic | git status --porcelain
16:51:13 | Git | GuardianProjectPublic | Conflict type: AU Graphics/gnupg/GPGTools.png
16:51:13 | Cmd | GuardianProjectPublic | git checkout --theirs "Graphics/gnupg/GPGTools.png"
error: path 'Graphics/gnupg/GPGTools.png' does not have their version
16:51:13 | Git | GuardianProjectPublic | Failed to resolve conflict, trying again...: Win32 IO returned ERROR_ALREADY_EXISTS. Path: at System.IO.File.Move (System.String sourceFileName, System.String destFileName) [0x00000] in <filename unknown>:0
at SparkleLib.Git.SparkleRepo.ResolveConflict () [0x00000] in <filename unknown>:0
at SparkleLib.Git.SparkleRepo.get_branch () [0x00000] in <filename unknown>:0
16:51:13 | Cmd | GuardianProjectPublic | git status --porcelain
16:51:13 | Cmd | GuardianProjectPublic | git status --porcelain
16:51:13 | Git | GuardianProjectPublic | Conflict type: AU Graphics/gnupg/GPGTools.png
16:51:13 | Cmd | GuardianProjectPublic | git checkout --theirs "Graphics/gnupg/GPGTools.png"
error: path 'Graphics/gnupg/GPGTools.png' does not have their version
16:51:13 | Git | GuardianProjectPublic | Failed to resolve conflict, trying again...: Win32 IO returned ERROR_ALREADY_EXISTS. Path: at System.IO.File.Move (System.String sourceFileName, System.String destFileName) [0x00000] in <filename unknown>:0
at SparkleLib.Git.SparkleRepo.ResolveConflict () [0x00000] in <filename unknown>:0
at SparkleLib.Git.SparkleRepo.get_branch () [0x00000] in <filename unknown>:0
16:51:13 | Cmd | GuardianProjectPublic | git status --porcelain
16:51:13 | Cmd | GuardianProjectPublic | git status --porcelain
16:51:13 | Git | GuardianProjectPublic | Conflict type: AU Graphics/gnupg/GPGTools.png
16:51:13 | Cmd | GuardianProjectPublic | git checkout --theirs "Graphics/gnupg/GPGTools.png"
error: path 'Graphics/gnupg/GPGTools.png' does not have their version
16:51:13 | Git | GuardianProjectPublic | Failed to resolve conflict, trying again...: Win32 IO returned ERROR_ALREADY_EXISTS. Path: at System.IO.File.Move (System.String sourceFileName, System.String destFileName) [0x00000] in <filename unknown>:0
at SparkleLib.Git.SparkleRepo.ResolveConflict () [0x00000] in <filename unknown>:0
at SparkleLib.Git.SparkleRepo.get_branch () [0x00000] in <filename unknown>:0
16:51:13 | Cmd | GuardianProjectPublic | git status --porcelain
16:51:13 | Cmd | GuardianProjectPublic | git status --porcelain
16:51:13 | Git | GuardianProjectPublic | Conflict type: AU Graphics/gnupg/GPGTools.png
16:51:13 | Cmd | GuardianProjectPublic | git checkout --theirs "Graphics/gnupg/GPGTools.png"
error: path 'Graphics/gnupg/GPGTools.png' does not have their version
16:51:13 | Git | GuardianProjectPublic | Failed to resolve conflict, trying again...: Win32 IO returned ERROR_ALREADY_EXISTS. Path: at System.IO.File.Move (System.String sourceFileName, System.String destFileName) [0x00000] in <filename unknown>:0
at SparkleLib.Git.SparkleRepo.ResolveConflict () [0x00000] in <filename unknown>:0
at SparkleLib.Git.SparkleRepo.get_branch () [0x00000] in <filename unknown>:0
16:51:13 | Cmd | GuardianProjectPublic | git status --porcelain
16:51:13 | Cmd | GuardianProjectPublic | git status --porcelain
16:51:13 | Git | GuardianProjectPublic | Conflict type: AU Graphics/gnupg/GPGTools.png
16:51:13 | Cmd | GuardianProjectPublic | git checkout --theirs "Graphics/gnupg/GPGTools.png"
error: path 'Graphics/gnupg/GPGTools.png' does not have their version
16:51:13 | Git | GuardianProjectPublic | Failed to resolve conflict, trying again...: Win32 IO returned ERROR_ALREADY_EXISTS. Path: at System.IO.File.Move (System.String sourceFileName, System.String destFileName) [0x00000] in <filename unknown>:0
at SparkleLib.Git.SparkleRepo.ResolveConflict () [0x00000] in <filename unknown>:0
at SparkleLib.Git.SparkleRepo.get_branch () [0x00000] in <filename unknown>:0
16:51:13 | Cmd | GuardianProjectPublic | git status --porcelain
16:51:13 | Cmd | GuardianProjectPublic | git status --porcelain
16:51:13 | Git | GuardianProjectPublic | Conflict type: AU Graphics/gnupg/GPGTools.png
16:51:13 | Cmd | GuardianProjectPublic | git checkout --theirs "Graphics/gnupg/GPGTools.png"
error: path 'Graphics/gnupg/GPGTools.png' does not have their version
16:51:13 | Git | GuardianProjectPublic | Failed to resolve conflict, trying again...: Win32 IO returned ERROR_ALREADY_EXISTS. Path: at System.IO.File.Move (System.String sourceFileName, System.String destFileName) [0x00000] in <filename unknown>:0
at SparkleLib.Git.SparkleRepo.ResolveConflict () [0x00000] in <filename unknown>:0
at SparkleLib.Git.SparkleRepo.get_branch () [0x00000] in <filename unknown>:0
16:51:13 | Cmd | GuardianProjectPublic | git status --porcelain
16:51:13 | Cmd | GuardianProjectPublic | git status --porcelain
16:51:13 | Git | GuardianProjectPublic | Conflict type: AU Graphics/gnupg/GPGTools.png
16:51:13 | Cmd | GuardianProjectPublic | git checkout --theirs "Graphics/gnupg/GPGTools.png"
error: path 'Graphics/gnupg/GPGTools.png' does not have their version
16:51:13 | Git | GuardianProjectPublic | Failed to resolve conflict, trying again...: Win32 IO returned ERROR_ALREADY_EXISTS. Path: at System.IO.File.Move (System.String sourceFileName, System.String destFileName) [0x00000] in <filename unknown>:0
at SparkleLib.Git.SparkleRepo.ResolveConflict () [0x00000] in <filename unknown>:0
at SparkleLib.Git.SparkleRepo.get_branch () [0x00000] in <filename unknown>:0
16:51:14 | Cmd | GuardianProjectPublic | git status --porcelain
16:51:14 | Cmd | GuardianProjectPublic | git status --porcelain
16:51:14 | Git | GuardianProjectPublic | Conflict type: AU Graphics/gnupg/GPGTools.png
16:51:14 | Cmd | GuardianProjectPublic | git checkout --theirs "Graphics/gnupg/GPGTools.png"
error: path 'Graphics/gnupg/GPGTools.png' does not have their version
16:51:14 | Git | GuardianProjectPublic | Failed to resolve conflict, trying again...: Win32 IO returned ERROR_ALREADY_EXISTS. Path: at System.IO.File.Move (System.String sourceFileName, System.String destFileName) [0x00000] in <filename unknown>:0
at SparkleLib.Git.SparkleRepo.ResolveConflict () [0x00000] in <filename unknown>:0
at SparkleLib.Git.SparkleRepo.get_branch () [0x00000] in <filename unknown>:0
16:51:14 | Cmd | GuardianProjectPublic | git status --porcelain
16:51:14 | Cmd | GuardianProjectPublic | git status --porcelain
16:51:14 | Git | GuardianProjectPublic | Conflict type: AU Graphics/gnupg/GPGTools.png
16:51:14 | Cmd | GuardianProjectPublic | git checkout --theirs "Graphics/gnupg/GPGTools.png"
error: path 'Graphics/gnupg/GPGTools.png' does not have their version
16:51:14 | Git | GuardianProjectPublic | Failed to resolve conflict, trying again...: Win32 IO returned ERROR_ALREADY_EXISTS. Path: at System.IO.File.Move (System.String sourceFileName, System.String destFileName) [0x00000] in <filename unknown>:0
at SparkleLib.Git.SparkleRepo.ResolveConflict () [0x00000] in <filename unknown>:0
at SparkleLib.Git.SparkleRepo.get_branch () [0x00000] in <filename unknown>:0
16:51:14 | Cmd | GuardianProjectPublic | git status --porcelain
16:51:14 | Cmd | GuardianProjectPublic | git status --porcelain
16:51:14 | Git | GuardianProjectPublic | Conflict type: AU Graphics/gnupg/GPGTools.png
16:51:14 | Cmd | GuardianProjectPublic | git checkout --theirs "Graphics/gnupg/GPGTools.png"
error: path 'Graphics/gnupg/GPGTools.png' does not have their version
16:51:14 | Git | GuardianProjectPublic | Failed to resolve conflict, trying again...: Win32 IO returned ERROR_ALREADY_EXISTS. Path: at System.IO.File.Move (System.String sourceFileName, System.String destFileName) [0x00000] in <filename unknown>:0
at SparkleLib.Git.SparkleRepo.ResolveConflict () [0x00000] in <filename unknown>:0
at SparkleLib.Git.SparkleRepo.get_branch () [0x00000] in <filename unknown>:0
16:51:14 | Cmd | GuardianProjectPublic | git status --porcelain
16:51:14 | Cmd | GuardianProjectPublic | git status --porcelain
16:51:14 | Git | GuardianProjectPublic | Conflict type: AU Graphics/gnupg/GPGTools.png
16:51:14 | Cmd | GuardianProjectPublic | git checkout --theirs "Graphics/gnupg/GPGTools.png"
error: path 'Graphics/gnupg/GPGTools.png' does not have their version
16:51:14 | Git | GuardianProjectPublic | Failed to resolve conflict, trying again...: Win32 IO returned ERROR_ALREADY_EXISTS. Path: at System.IO.File.Move (System.String sourceFileName, System.String destFileName) [0x00000] in <filename unknown>:0
at SparkleLib.Git.SparkleRepo.ResolveConflict () [0x00000] in <filename unknown>:0
at SparkleLib.Git.SparkleRepo.get_branch () [0x00000] in <filename unknown>:0
16:51:14 | Cmd | GuardianProjectPublic | git status --porcelain
16:51:14 | Cmd | GuardianProjectPublic | git status --porcelain
16:51:14 | Git | GuardianProjectPublic | Conflict type: AU Graphics/gnupg/GPGTools.png
16:51:14 | Cmd | GuardianProjectPublic | git checkout --theirs "Graphics/gnupg/GPGTools.png"
error: path 'Graphics/gnupg/GPGTools.png' does not have their version
16:51:14 | Git | GuardianProjectPublic | Failed to resolve conflict, trying again...: Win32 IO returned ERROR_ALREADY_EXISTS. Path: at System.IO.File.Move (System.String sourceFileName, System.String destFileName) [0x00000] in <filename unknown>:0
at SparkleLib.Git.SparkleRepo.ResolveConflict () [0x00000] in <filename unknown>:0
at SparkleLib.Git.SparkleRepo.get_branch () [0x00000] in <filename unknown>:0
16:51:14 | Cmd | GuardianProjectPublic | git status --porcelain
16:51:14 | Cmd | GuardianProjectPublic | git status --porcelain
16:51:14 | Git | GuardianProjectPublic | Conflict type: AU Graphics/gnupg/GPGTools.png
16:51:14 | Cmd | GuardianProjectPublic | git checkout --theirs "Graphics/gnupg/GPGTools.png"
error: path 'Graphics/gnupg/GPGTools.png' does not have their version
16:51:14 | Git | GuardianProjectPublic | Failed to resolve conflict, trying again...: Win32 IO returned ERROR_ALREADY_EXISTS. Path: at System.IO.File.Move (System.String sourceFileName, System.String destFileName) [0x00000] in <filename unknown>:0
at SparkleLib.Git.SparkleRepo.ResolveConflict () [0x00000] in <filename unknown>:0
at SparkleLib.Git.SparkleRepo.get_branch () [0x00000] in <filename unknown>:0
16:51:14 | Cmd | GuardianProjectPublic | git status --porcelain
16:51:14 | Cmd | GuardianProjectPublic | git status --porcelain
16:51:14 | Git | GuardianProjectPublic | Conflict type: AU Graphics/gnupg/GPGTools.png
16:51:14 | Cmd | GuardianProjectPublic | git checkout --theirs "Graphics/gnupg/GPGTools.png"
error: path 'Graphics/gnupg/GPGTools.png' does not have their version
16:51:14 | Git | GuardianProjectPublic | Failed to resolve conflict, trying again...: Win32 IO returned ERROR_ALREADY_EXISTS. Path: at System.IO.File.Move (System.String sourceFileName, System.String destFileName) [0x00000] in <filename unknown>:0
at SparkleLib.Git.SparkleRepo.ResolveConflict () [0x00000] in <filename unknown>:0
at SparkleLib.Git.SparkleRepo.get_branch () [0x00000] in <filename unknown>:0
16:51:14 | Cmd | GuardianProjectPublic | git status --porcelain
16:51:14 | Cmd | GuardianProjectPublic | git status --porcelain
16:51:14 | Git | GuardianProjectPublic | Conflict type: AU Graphics/gnupg/GPGTools.png
16:51:14 | Cmd | GuardianProjectPublic | git checkout --theirs "Graphics/gnupg/GPGTools.png"
error: path 'Graphics/gnupg/GPGTools.png' does not have their version
16:51:14 | Git | GuardianProjectPublic | Failed to resolve conflict, trying again...: Win32 IO returned ERROR_ALREADY_EXISTS. Path: at System.IO.File.Move (System.String sourceFileName, System.String destFileName) [0x00000] in <filename unknown>:0
at SparkleLib.Git.SparkleRepo.ResolveConflict () [0x00000] in <filename unknown>:0
at SparkleLib.Git.SparkleRepo.get_branch () [0x00000] in <filename unknown>:0
16:51:14 | Cmd | GuardianProjectPublic | git status --porcelain
16:51:14 | Cmd | GuardianProjectPublic | git status --porcelain
16:51:14 | Git | GuardianProjectPublic | Conflict type: AU Graphics/gnupg/GPGTools.png
16:51:14 | Cmd | GuardianProjectPublic | git checkout --theirs "Graphics/gnupg/GPGTools.png"
error: path 'Graphics/gnupg/GPGTools.png' does not have their version
16:51:14 | Git | GuardianProjectPublic | Failed to resolve conflict, trying again...: Win32 IO returned ERROR_ALREADY_EXISTS. Path: at System.IO.File.Move (System.String sourceFileName, System.String destFileName) [0x00000] in <filename unknown>:0
at SparkleLib.Git.SparkleRepo.ResolveConflict () [0x00000] in <filename unknown>:0
at SparkleLib.Git.SparkleRepo.get_branch () [0x00000] in <filename unknown>:0
16:51:14 | Cmd | GuardianProjectPublic | git status --porcelain
16:51:14 | Cmd | GuardianProjectPublic | git status --porcelain
16:51:15 | Git | GuardianProjectPublic | Conflict type: AU Graphics/gnupg/GPGTools.png
16:51:15 | Cmd | GuardianProjectPublic | git checkout --theirs "Graphics/gnupg/GPGTools.png"
error: path 'Graphics/gnupg/GPGTools.png' does not have their version
16:51:15 | Git | GuardianProjectPublic | Failed to resolve conflict, trying again...: Win32 IO returned ERROR_ALREADY_EXISTS. Path: at System.IO.File.Move (System.String sourceFileName, System.String destFileName) [0x00000] in <filename unknown>:0
at SparkleLib.Git.SparkleRepo.ResolveConflict () [0x00000] in <filename unknown>:0
at SparkleLib.Git.SparkleRepo.get_branch () [0x00000] in <filename unknown>:0
16:51:15 | Cmd | GuardianProjectPublic | git status --porcelain
16:51:15 | Cmd | GuardianProjectPublic | git status --porcelain
16:51:15 | Git | GuardianProjectPublic | Conflict type: AU Graphics/gnupg/GPGTools.png
16:51:15 | Cmd | GuardianProjectPublic | git checkout --theirs "Graphics/gnupg/GPGTools.png"
error: path 'Graphics/gnupg/GPGTools.png' does not have their version
16:51:15 | Git | GuardianProjectPublic | Failed to resolve conflict, trying again...: Win32 IO returned ERROR_ALREADY_EXISTS. Path: at System.IO.File.Move (System.String sourceFileName, System.String destFileName) [0x00000] in <filename unknown>:0
at SparkleLib.Git.SparkleRepo.ResolveConflict () [0x00000] in <filename unknown>:0
at SparkleLib.Git.SparkleRepo.get_branch () [0x00000] in <filename unknown>:0
16:51:15 | Cmd | GuardianProjectPublic | git status --porcelain
16:51:15 | Cmd | GuardianProjectPublic | git status --porcelain
16:51:15 | Git | GuardianProjectPublic | Conflict type: AU Graphics/gnupg/GPGTools.png
16:51:15 | Cmd | GuardianProjectPublic | git checkout --theirs "Graphics/gnupg/GPGTools.png"
error: path 'Graphics/gnupg/GPGTools.png' does not have their version
16:51:15 | Git | GuardianProjectPublic | Failed to resolve conflict, trying again...: Win32 IO returned ERROR_ALREADY_EXISTS. Path: at System.IO.File.Move (System.String sourceFileName, System.String destFileName) [0x00000] in <filename unknown>:0
at SparkleLib.Git.SparkleRepo.ResolveConflict () [0x00000] in <filename unknown>:0
at SparkleLib.Git.SparkleRepo.get_branch () [0x00000] in <filename unknown>:0
16:51:15 | Cmd | GuardianProjectPublic | git status --porcelain
16:51:15 | Cmd | GuardianProjectPublic | git status --porcelain
16:51:15 | Git | GuardianProjectPublic | Conflict type: AU Graphics/gnupg/GPGTools.png
16:51:15 | Cmd | GuardianProjectPublic | git checkout --theirs "Graphics/gnupg/GPGTools.png"
error: path 'Graphics/gnupg/GPGTools.png' does not have their version
16:51:15 | Git | GuardianProjectPublic | Failed to resolve conflict, trying again...: Win32 IO returned ERROR_ALREADY_EXISTS. Path: at System.IO.File.Move (System.String sourceFileName, System.String destFileName) [0x00000] in <filename unknown>:0
at SparkleLib.Git.SparkleRepo.ResolveConflict () [0x00000] in <filename unknown>:0
at SparkleLib.Git.SparkleRepo.get_branch () [0x00000] in <filename unknown>:0
16:51:15 | Cmd | GuardianProjectPublic | git status --porcelain
16:51:15 | Cmd | GuardianProjectPublic | git status --porcelain
16:51:15 | Git | GuardianProjectPublic | Conflict type: AU Graphics/gnupg/GPGTools.png
16:51:15 | Cmd | GuardianProjectPublic | git checkout --theirs "Graphics/gnupg/GPGTools.png"
error: path 'Graphics/gnupg/GPGTools.png' does not have their version
16:51:15 | Git | GuardianProjectPublic | Failed to resolve conflict, trying again...: Win32 IO returned ERROR_ALREADY_EXISTS. Path: at System.IO.File.Move (System.String sourceFileName, System.String destFileName) [0x00000] in <filename unknown>:0
at SparkleLib.Git.SparkleRepo.ResolveConflict () [0x00000] in <filename unknown>:0
at SparkleLib.Git.SparkleRepo.get_branch () [0x00000] in <filename unknown>:0
16:51:15 | Cmd | GuardianProjectPublic | git status --porcelain
16:51:15 | Cmd | GuardianProjectPublic | git status --porcelain
16:51:15 | Git | GuardianProjectPublic | Conflict type: AU Graphics/gnupg/GPGTools.png
16:51:15 | Cmd | GuardianProjectPublic | git checkout --theirs "Graphics/gnupg/GPGTools.png"
error: path 'Graphics/gnupg/GPGTools.png' does not have their version
16:51:15 | Git | GuardianProjectPublic | Failed to resolve conflict, trying again...: Win32 IO returned ERROR_ALREADY_EXISTS. Path: at System.IO.File.Move (System.String sourceFileName, System.String destFileName) [0x00000] in <filename unknown>:0
at SparkleLib.Git.SparkleRepo.ResolveConflict () [0x00000] in <filename unknown>:0
at SparkleLib.Git.SparkleRepo.get_branch () [0x00000] in <filename unknown>:0
16:51:15 | Cmd | GuardianProjectPublic | git status --porcelain
16:51:15 | Cmd | GuardianProjectPublic | git status --porcelain
16:51:15 | Git | GuardianProjectPublic | Conflict type: AU Graphics/gnupg/GPGTools.png
16:51:15 | Cmd | GuardianProjectPublic | git checkout --theirs "Graphics/gnupg/GPGTools.png"
error: path 'Graphics/gnupg/GPGTools.png' does not have their version
16:51:15 | Git | GuardianProjectPublic | Failed to resolve conflict, trying again...: Win32 IO returned ERROR_ALREADY_EXISTS. Path: at System.IO.File.Move (System.String sourceFileName, System.String destFileName) [0x00000] in <filename unknown>:0
at SparkleLib.Git.SparkleRepo.ResolveConflict () [0x00000] in <filename unknown>:0
at SparkleLib.Git.SparkleRepo.get_branch () [0x00000] in <filename unknown>:0
16:51:15 | Cmd | GuardianProjectPublic | git status --porcelain
16:51:15 | Cmd | GuardianProjectPublic | git status --porcelain
16:51:15 | Git | GuardianProjectPublic | Conflict type: AU Graphics/gnupg/GPGTools.png
16:51:15 | Cmd | GuardianProjectPublic | git checkout --theirs "Graphics/gnupg/GPGTools.png"
error: path 'Graphics/gnupg/GPGTools.png' does not have their version
16:51:15 | Git | GuardianProjectPublic | Failed to resolve conflict, trying again...: Win32 IO returned ERROR_ALREADY_EXISTS. Path: at System.IO.File.Move (System.String sourceFileName, System.String destFileName) [0x00000] in <filename unknown>:0
at SparkleLib.Git.SparkleRepo.ResolveConflict () [0x00000] in <filename unknown>:0
at SparkleLib.Git.SparkleRepo.get_branch () [0x00000] in <filename unknown>:0
16:51:15 | Cmd | GuardianProjectPublic | git status --porcelain
16:51:15 | Cmd | GuardianProjectPublic | git status --porcelain
16:51:15 | Git | GuardianProjectPublic | Conflict type: AU Graphics/gnupg/GPGTools.png
16:51:15 | Cmd | GuardianProjectPublic | git checkout --theirs "Graphics/gnupg/GPGTools.png"
error: path 'Graphics/gnupg/GPGTools.png' does not have their version
16:51:15 | Git | GuardianProjectPublic | Failed to resolve conflict, trying again...: Win32 IO returned ERROR_ALREADY_EXISTS. Path: at System.IO.File.Move (System.String sourceFileName, System.String destFileName) [0x00000] in <filename unknown>:0
at SparkleLib.Git.SparkleRepo.ResolveConflict () [0x00000] in <filename unknown>:0
at SparkleLib.Git.SparkleRepo.get_branch () [0x00000] in <filename unknown>:0
16:51:15 | Cmd | GuardianProjectPublic | git status --porcelain
16:51:15 | Cmd | GuardianProjectPublic | git status --porcelain
16:51:16 | Git | GuardianProjectPublic | Conflict type: AU Graphics/gnupg/GPGTools.png
16:51:16 | Cmd | GuardianProjectPublic | git checkout --theirs "Graphics/gnupg/GPGTools.png"
error: path 'Graphics/gnupg/GPGTools.png' does not have their version
16:51:16 | Git | GuardianProjectPublic | Failed to resolve conflict, trying again...: Win32 IO returned ERROR_ALREADY_EXISTS. Path: at System.IO.File.Move (System.String sourceFileName, System.String destFileName) [0x00000] in <filename unknown>:0
at SparkleLib.Git.SparkleRepo.ResolveConflict () [0x00000] in <filename unknown>:0
at SparkleLib.Git.SparkleRepo.get_branch () [0x00000] in <filename unknown>:0
16:51:16 | Cmd | GuardianProjectPublic | git status --porcelain
16:51:16 | Cmd | GuardianProjectPublic | git status --porcelain
16:51:16 | Git | GuardianProjectPublic | Conflict type: AU Graphics/gnupg/GPGTools.png
16:51:16 | Cmd | GuardianProjectPublic | git checkout --theirs "Graphics/gnupg/GPGTools.png"
error: path 'Graphics/gnupg/GPGTools.png' does not have their version
16:51:16 | Git | GuardianProjectPublic | Failed to resolve conflict, trying again...: Win32 IO returned ERROR_ALREADY_EXISTS. Path: at System.IO.File.Move (System.String sourceFileName, System.String destFileName) [0x00000] in <filename unknown>:0
at SparkleLib.Git.SparkleRepo.ResolveConflict () [0x00000] in <filename unknown>:0
at SparkleLib.Git.SparkleRepo.get_branch () [0x00000] in <filename unknown>:0
16:51:16 | Cmd | GuardianProjectPublic | git status --porcelain
16:51:16 | Cmd | GuardianProjectPublic | git status --porcelain
16:51:16 | Git | GuardianProjectPublic | Conflict type: AU Graphics/gnupg/GPGTools.png
16:51:16 | Cmd | GuardianProjectPublic | git checkout --theirs "Graphics/gnupg/GPGTools.png"
error: path 'Graphics/gnupg/GPGTools.png' does not have their version
16:51:16 | Git | GuardianProjectPublic | Failed to resolve conflict, trying again...: Win32 IO returned ERROR_ALREADY_EXISTS. Path: at System.IO.File.Move (System.String sourceFileName, System.String destFileName) [0x00000] in <filename unknown>:0
at SparkleLib.Git.SparkleRepo.ResolveConflict () [0x00000] in <filename unknown>:0
at SparkleLib.Git.SparkleRepo.get_branch () [0x00000] in <filename unknown>:0
16:51:16 | Cmd | GuardianProjectPublic | git status --porcelain
16:51:16 | Cmd | GuardianProjectPublic | git status --porcelain
16:51:16 | Git | GuardianProjectPublic | Conflict type: AU Graphics/gnupg/GPGTools.png
16:51:16 | Cmd | GuardianProjectPublic | git checkout --theirs "Graphics/gnupg/GPGTools.png"
error: path 'Graphics/gnupg/GPGTools.png' does not have their version
16:51:16 | Git | GuardianProjectPublic | Failed to resolve conflict, trying again...: Win32 IO returned ERROR_ALREADY_EXISTS. Path: at System.IO.File.Move (System.String sourceFileName, System.String destFileName) [0x00000] in <filename unknown>:0
at SparkleLib.Git.SparkleRepo.ResolveConflict () [0x00000] in <filename unknown>:0
at SparkleLib.Git.SparkleRepo.get_branch () [0x00000] in <filename unknown>:0
16:51:16 | Cmd | GuardianProjectPublic | git status --porcelain
16:51:16 | Cmd | GuardianProjectPublic | git status --porcelain
16:51:16 | Git | GuardianProjectPublic | Conflict type: AU Graphics/gnupg/GPGTools.png
16:51:16 | Cmd | GuardianProjectPublic | git checkout --theirs "Graphics/gnupg/GPGTools.png"
error: path 'Graphics/gnupg/GPGTools.png' does not have their version
16:51:16 | Git | GuardianProjectPublic | Failed to resolve conflict, trying again...: Win32 IO returned ERROR_ALREADY_EXISTS. Path: at System.IO.File.Move (System.String sourceFileName, System.String destFileName) [0x00000] in <filename unknown>:0
at SparkleLib.Git.SparkleRepo.ResolveConflict () [0x00000] in <filename unknown>:0
at SparkleLib.Git.SparkleRepo.get_branch () [0x00000] in <filename unknown>:0
16:51:16 | Cmd | GuardianProjectPublic | git status --porcelain
16:51:16 | Cmd | GuardianProjectPublic | git status --porcelain
16:51:16 | Git | GuardianProjectPublic | Conflict type: AU Graphics/gnupg/GPGTools.png
16:51:16 | Cmd | GuardianProjectPublic | git checkout --theirs "Graphics/gnupg/GPGTools.png"
error: path 'Graphics/gnupg/GPGTools.png' does not have their version
16:51:16 | Git | GuardianProjectPublic | Failed to resolve conflict, trying again...: Win32 IO returned ERROR_ALREADY_EXISTS. Path: at System.IO.File.Move (System.String sourceFileName, System.String destFileName) [0x00000] in <filename unknown>:0
at SparkleLib.Git.SparkleRepo.ResolveConflict () [0x00000] in <filename unknown>:0
at SparkleLib.Git.SparkleRepo.get_branch () [0x00000] in <filename unknown>:0
16:51:16 | Cmd | GuardianProjectPublic | git status --porcelain
16:51:16 | Cmd | GuardianProjectPublic | git status --porcelain
16:51:16 | Git | GuardianProjectPublic | Conflict type: AU Graphics/gnupg/GPGTools.png
16:51:16 | Cmd | GuardianProjectPublic | git checkout --theirs "Graphics/gnupg/GPGTools.png"
error: path 'Graphics/gnupg/GPGTools.png' does not have their version
16:51:16 | Git | GuardianProjectPublic | Failed to resolve conflict, trying again...: Win32 IO returned ERROR_ALREADY_EXISTS. Path: at System.IO.File.Move (System.String sourceFileName, System.String destFileName) [0x00000] in <filename unknown>:0
at SparkleLib.Git.SparkleRepo.ResolveConflict () [0x00000] in <filename unknown>:0
at SparkleLib.Git.SparkleRepo.get_branch () [0x00000] in <filename unknown>:0
16:51:16 | Cmd | GuardianProjectPublic | git status --porcelain
16:51:16 | Cmd | GuardianProjectPublic | git status --porcelain
16:51:16 | Git | GuardianProjectPublic | Conflict type: AU Graphics/gnupg/GPGTools.png
16:51:16 | Cmd | GuardianProjectPublic | git checkout --theirs "Graphics/gnupg/GPGTools.png"
error: path 'Graphics/gnupg/GPGTools.png' does not have their version
16:51:16 | Git | GuardianProjectPublic | Failed to resolve conflict, trying again...: Win32 IO returned ERROR_ALREADY_EXISTS. Path: at System.IO.File.Move (System.String sourceFileName, System.String destFileName) [0x00000] in <filename unknown>:0
at SparkleLib.Git.SparkleRepo.ResolveConflict () [0x00000] in <filename unknown>:0
at SparkleLib.Git.SparkleRepo.get_branch () [0x00000] in <filename unknown>:0
16:51:16 | Cmd | GuardianProjectPublic | git status --porcelain
16:51:16 | Cmd | GuardianProjectPublic | git status --porcelain
16:51:16 | Git | GuardianProjectPublic | Conflict type: AU Graphics/gnupg/GPGTools.png
16:51:16 | Cmd | GuardianProjectPublic | git checkout --theirs "Graphics/gnupg/GPGTools.png"
error: path 'Graphics/gnupg/GPGTools.png' does not have their version
16:51:16 | Git | GuardianProjectPublic | Failed to resolve conflict, trying again...: Win32 IO returned ERROR_ALREADY_EXISTS. Path: at System.IO.File.Move (System.String sourceFileName, System.String destFileName) [0x00000] in <filename unknown>:0
at SparkleLib.Git.SparkleRepo.ResolveConflict () [0x00000] in <filename unknown>:0
at SparkleLib.Git.SparkleRepo.get_branch () [0x00000] in <filename unknown>:0
16:51:17 | Cmd | GuardianProjectPublic | git status --porcelain
16:51:17 | Cmd | GuardianProjectPublic | git status --porcelain
16:51:17 | Git | GuardianProjectPublic | Conflict type: AU Graphics/gnupg/GPGTools.png
16:51:17 | Cmd | GuardianProjectPublic | git checkout --theirs "Graphics/gnupg/GPGTools.png"
error: path 'Graphics/gnupg/GPGTools.png' does not have their version
16:51:17 | Git | GuardianProjectPublic | Failed to resolve conflict, trying again...: Win32 IO returned ERROR_ALREADY_EXISTS. Path: at System.IO.File.Move (System.String sourceFileName, System.String destFileName) [0x00000] in <filename unknown>:0
at SparkleLib.Git.SparkleRepo.ResolveConflict () [0x00000] in <filename unknown>:0
at SparkleLib.Git.SparkleRepo.get_branch () [0x00000] in <filename unknown>:0
16:51:17 | Cmd | GuardianProjectPublic | git status --porcelain
16:51:17 | Cmd | GuardianProjectPublic | git status --porcelain
16:51:17 | Git | GuardianProjectPublic | Conflict type: AU Graphics/gnupg/GPGTools.png
16:51:17 | Cmd | GuardianProjectPublic | git checkout --theirs "Graphics/gnupg/GPGTools.png"
error: path 'Graphics/gnupg/GPGTools.png' does not have their version
16:51:17 | Git | GuardianProjectPublic | Failed to resolve conflict, trying again...: Win32 IO returned ERROR_ALREADY_EXISTS. Path: at System.IO.File.Move (System.String sourceFileName, System.String destFileName) [0x00000] in <filename unknown>:0
at SparkleLib.Git.SparkleRepo.ResolveConflict () [0x00000] in <filename unknown>:0
at SparkleLib.Git.SparkleRepo.get_branch () [0x00000] in <filename unknown>:0
16:51:17 | Cmd | GuardianProjectPublic | git status --porcelain
16:51:17 | Cmd | GuardianProjectPublic | git status --porcelain
16:51:17 | Git | GuardianProjectPublic | Conflict type: AU Graphics/gnupg/GPGTools.png
16:51:17 | Cmd | GuardianProjectPublic | git checkout --theirs "Graphics/gnupg/GPGTools.png"
error: path 'Graphics/gnupg/GPGTools.png' does not have their version
16:51:17 | Git | GuardianProjectPublic | Failed to resolve conflict, trying again...: Win32 IO returned ERROR_ALREADY_EXISTS. Path: at System.IO.File.Move (System.String sourceFileName, System.String destFileName) [0x00000] in <filename unknown>:0
at SparkleLib.Git.SparkleRepo.ResolveConflict () [0x00000] in <filename unknown>:0
at SparkleLib.Git.SparkleRepo.get_branch () [0x00000] in <filename unknown>:0
16:51:17 | Cmd | GuardianProjectPublic | git status --porcelain
16:51:17 | Cmd | GuardianProjectPublic | git status --porcelain
16:51:17 | Git | GuardianProjectPublic | Conflict type: AU Graphics/gnupg/GPGTools.png
16:51:17 | Cmd | GuardianProjectPublic | git checkout --theirs "Graphics/gnupg/GPGTools.png"
error: path 'Graphics/gnupg/GPGTools.png' does not have their version
16:51:17 | Git | GuardianProjectPublic | Failed to resolve conflict, trying again...: Win32 IO returned ERROR_ALREADY_EXISTS. Path: at System.IO.File.Move (System.String sourceFileName, System.String destFileName) [0x00000] in <filename unknown>:0
at SparkleLib.Git.SparkleRepo.ResolveConflict () [0x00000] in <filename unknown>:0
at SparkleLib.Git.SparkleRepo.get_branch () [0x00000] in <filename unknown>:0
16:51:17 | Cmd | GuardianProjectPublic | git status --porcelain
16:51:17 | Cmd | GuardianProjectPublic | git status --porcelain
16:51:17 | Git | GuardianProjectPublic | Conflict type: AU Graphics/gnupg/GPGTools.png
16:51:17 | Cmd | GuardianProjectPublic | git checkout --theirs "Graphics/gnupg/GPGTools.png"
error: path 'Graphics/gnupg/GPGTools.png' does not have their version
16:51:17 | Git | GuardianProjectPublic | Failed to resolve conflict, trying again...: Win32 IO returned ERROR_ALREADY_EXISTS. Path: at System.IO.File.Move (System.String sourceFileName, System.String destFileName) [0x00000] in <filename unknown>:0
at SparkleLib.Git.SparkleRepo.ResolveConflict () [0x00000] in <filename unknown>:0
at SparkleLib.Git.SparkleRepo.get_branch () [0x00000] in <filename unknown>:0
16:51:17 | Cmd | GuardianProjectPublic | git status --porcelain
16:51:17 | Cmd | GuardianProjectPublic | git status --porcelain
16:51:17 | Git | GuardianProjectPublic | Conflict type: AU Graphics/gnupg/GPGTools.png
16:51:17 | Cmd | GuardianProjectPublic | git checkout --theirs "Graphics/gnupg/GPGTools.png"
error: path 'Graphics/gnupg/GPGTools.png' does not have their version
16:51:17 | Git | GuardianProjectPublic | Failed to resolve conflict, trying again...: Win32 IO returned ERROR_ALREADY_EXISTS. Path: at System.IO.File.Move (System.String sourceFileName, System.String destFileName) [0x00000] in <filename unknown>:0
at SparkleLib.Git.SparkleRepo.ResolveConflict () [0x00000] in <filename unknown>:0
at SparkleLib.Git.SparkleRepo.get_branch () [0x00000] in <filename unknown>:0
16:51:17 | Cmd | GuardianProjectPublic | git status --porcelain
16:51:17 | Cmd | GuardianProjectPublic | git status --porcelain
16:51:17 | Git | GuardianProjectPublic | Conflict type: AU Graphics/gnupg/GPGTools.png
16:51:17 | Cmd | GuardianProjectPublic | git checkout --theirs "Graphics/gnupg/GPGTools.png"
error: path 'Graphics/gnupg/GPGTools.png' does not have their version
16:51:17 | Git | GuardianProjectPublic | Failed to resolve conflict, trying again...: Win32 IO returned ERROR_ALREADY_EXISTS. Path: at System.IO.File.Move (System.String sourceFileName, System.String destFileName) [0x00000] in <filename unknown>:0
at SparkleLib.Git.SparkleRepo.ResolveConflict () [0x00000] in <filename unknown>:0
at SparkleLib.Git.SparkleRepo.get_branch () [0x00000] in <filename unknown>:0
16:51:17 | Cmd | GuardianProjectPublic | git status --porcelain
16:51:17 | Cmd | GuardianProjectPublic | git status --porcelain
16:51:17 | Git | GuardianProjectPublic | Conflict type: AU Graphics/gnupg/GPGTools.png
16:51:17 | Cmd | GuardianProjectPublic | git checkout --theirs "Graphics/gnupg/GPGTools.png"
error: path 'Graphics/gnupg/GPGTools.png' does not have their version
16:51:17 | Git | GuardianProjectPublic | Failed to resolve conflict, trying again...: Win32 IO returned ERROR_ALREADY_EXISTS. Path: at System.IO.File.Move (System.String sourceFileName, System.String destFileName) [0x00000] in <filename unknown>:0
at SparkleLib.Git.SparkleRepo.ResolveConflict () [0x00000] in <filename unknown>:0
at SparkleLib.Git.SparkleRepo.get_branch () [0x00000] in <filename unknown>:0
16:51:17 | Cmd | GuardianProjectPublic | git status --porcelain
16:51:17 | Cmd | GuardianProjectPublic | git status --porcelain
16:51:17 | Git | GuardianProjectPublic | Conflict type: AU Graphics/gnupg/GPGTools.png
16:51:17 | Cmd | GuardianProjectPublic | git checkout --theirs "Graphics/gnupg/GPGTools.png"
error: path 'Graphics/gnupg/GPGTools.png' does not have their version
16:51:17 | Git | GuardianProjectPublic | Failed to resolve conflict, trying again...: Win32 IO returned ERROR_ALREADY_EXISTS. Path: at System.IO.File.Move (System.String sourceFileName, System.String destFileName) [0x00000] in <filename unknown>:0
at SparkleLib.Git.SparkleRepo.ResolveConflict () [0x00000] in <filename unknown>:0
at SparkleLib.Git.SparkleRepo.get_branch () [0x00000] in <filename unknown>:0
16:51:18 | Cmd | GuardianProjectPublic | git status --porcelain
16:51:18 | Cmd | GuardianProjectPublic | git status --porcelain
16:51:18 | Git | GuardianProjectPublic | Conflict type: AU Graphics/gnupg/GPGTools.png
16:51:18 | Cmd | GuardianProjectPublic | git checkout --theirs "Graphics/gnupg/GPGTools.png"
error: path 'Graphics/gnupg/GPGTools.png' does not have their version
16:51:18 | Git | GuardianProjectPublic | Failed to resolve conflict, trying again...: Win32 IO returned ERROR_ALREADY_EXISTS. Path: at System.IO.File.Move (System.String sourceFileName, System.String destFileName) [0x00000] in <filename unknown>:0
at SparkleLib.Git.SparkleRepo.ResolveConflict () [0x00000] in <filename unknown>:0
at SparkleLib.Git.SparkleRepo.get_branch () [0x00000] in <filename unknown>:0
16:51:18 | Cmd | GuardianProjectPublic | git status --porcelain
16:51:18 | Cmd | GuardianProjectPublic | git status --porcelain
16:51:18 | Git | GuardianProjectPublic | Conflict type: AU Graphics/gnupg/GPGTools.png
16:51:18 | Cmd | GuardianProjectPublic | git checkout --theirs "Graphics/gnupg/GPGTools.png"
error: path 'Graphics/gnupg/GPGTools.png' does not have their version
16:51:18 | Git | GuardianProjectPublic | Failed to resolve conflict, trying again...: Win32 IO returned ERROR_ALREADY_EXISTS. Path: at System.IO.File.Move (System.String sourceFileName, System.String destFileName) [0x00000] in <filename unknown>:0
at SparkleLib.Git.SparkleRepo.ResolveConflict () [0x00000] in <filename unknown>:0
at SparkleLib.Git.SparkleRepo.get_branch () [0x00000] in <filename unknown>:0
16:51:18 | Cmd | GuardianProjectPublic | git status --porcelain
16:51:18 | Cmd | GuardianProjectPublic | git status --porcelain
16:51:18 | Git | GuardianProjectPublic | Conflict type: AU Graphics/gnupg/GPGTools.png
16:51:18 | Cmd | GuardianProjectPublic | git checkout --theirs "Graphics/gnupg/GPGTools.png"
error: path 'Graphics/gnupg/GPGTools.png' does not have their version
16:51:18 | Git | GuardianProjectPublic | Failed to resolve conflict, trying again...: Win32 IO returned ERROR_ALREADY_EXISTS. Path: at System.IO.File.Move (System.String sourceFileName, System.String destFileName) [0x00000] in <filename unknown>:0
at SparkleLib.Git.SparkleRepo.ResolveConflict () [0x00000] in <filename unknown>:0
at SparkleLib.Git.SparkleRepo.get_branch () [0x00000] in <filename unknown>:0
16:51:18 | Cmd | GuardianProjectPublic | git status --porcelain
16:51:18 | Cmd | GuardianProjectPublic | git status --porcelain
16:51:18 | Git | GuardianProjectPublic | Conflict type: AU Graphics/gnupg/GPGTools.png
16:51:18 | Cmd | GuardianProjectPublic | git checkout --theirs "Graphics/gnupg/GPGTools.png"
error: path 'Graphics/gnupg/GPGTools.png' does not have their version
16:51:18 | Git | GuardianProjectPublic | Failed to resolve conflict, trying again...: Win32 IO returned ERROR_ALREADY_EXISTS. Path: at System.IO.File.Move (System.String sourceFileName, System.String destFileName) [0x00000] in <filename unknown>:0
at SparkleLib.Git.SparkleRepo.ResolveConflict () [0x00000] in <filename unknown>:0
at SparkleLib.Git.SparkleRepo.get_branch () [0x00000] in <filename unknown>:0
16:51:18 | Cmd | GuardianProjectPublic | git status --porcelain
16:51:18 | Cmd | GuardianProjectPublic | git status --porcelain
16:51:18 | Git | GuardianProjectPublic | Conflict type: AU Graphics/gnupg/GPGTools.png
16:51:18 | Cmd | GuardianProjectPublic | git checkout --theirs "Graphics/gnupg/GPGTools.png"
error: path 'Graphics/gnupg/GPGTools.png' does not have their version
16:51:18 | Git | GuardianProjectPublic | Failed to resolve conflict, trying again...: Win32 IO returned ERROR_ALREADY_EXISTS. Path: at System.IO.File.Move (System.String sourceFileName, System.String destFileName) [0x00000] in <filename unknown>:0
at SparkleLib.Git.SparkleRepo.ResolveConflict () [0x00000] in <filename unknown>:0
at SparkleLib.Git.SparkleRepo.get_branch () [0x00000] in <filename unknown>:0
16:51:18 | Cmd | GuardianProjectPublic | git status --porcelain
16:51:18 | Cmd | GuardianProjectPublic | git status --porcelain
16:51:18 | Git | GuardianProjectPublic | Conflict type: AU Graphics/gnupg/GPGTools.png
16:51:18 | Cmd | GuardianProjectPublic | git checkout --theirs "Graphics/gnupg/GPGTools.png"
error: path 'Graphics/gnupg/GPGTools.png' does not have their version
16:51:18 | Git | GuardianProjectPublic | Failed to resolve conflict, trying again...: Win32 IO returned ERROR_ALREADY_EXISTS. Path: at System.IO.File.Move (System.String sourceFileName, System.String destFileName) [0x00000] in <filename unknown>:0
at SparkleLib.Git.SparkleRepo.ResolveConflict () [0x00000] in <filename unknown>:0
at SparkleLib.Git.SparkleRepo.get_branch () [0x00000] in <filename unknown>:0
16:51:18 | Cmd | GuardianProjectPublic | git status --porcelain
16:51:18 | Cmd | GuardianProjectPublic | git status --porcelain
16:51:18 | Git | GuardianProjectPublic | Conflict type: AU Graphics/gnupg/GPGTools.png
16:51:18 | Cmd | GuardianProjectPublic | git checkout --theirs "Graphics/gnupg/GPGTools.png"
error: path 'Graphics/gnupg/GPGTools.png' does not have their version
16:51:18 | Git | GuardianProjectPublic | Failed to resolve conflict, trying again...: Win32 IO returned ERROR_ALREADY_EXISTS. Path: at System.IO.File.Move (System.String sourceFileName, System.String destFileName) [0x00000] in <filename unknown>:0
at SparkleLib.Git.SparkleRepo.ResolveConflict () [0x00000] in <filename unknown>:0
at SparkleLib.Git.SparkleRepo.get_branch () [0x00000] in <filename unknown>:0
16:51:18 | Cmd | GuardianProjectPublic | git status --porcelain
16:51:18 | Cmd | GuardianProjectPublic | git status --porcelain
16:51:18 | Git | GuardianProjectPublic | Conflict type: AU Graphics/gnupg/GPGTools.png
16:51:18 | Cmd | GuardianProjectPublic | git checkout --theirs "Graphics/gnupg/GPGTools.png"
error: path 'Graphics/gnupg/GPGTools.png' does not have their version
16:51:18 | Git | GuardianProjectPublic | Failed to resolve conflict, trying again...: Win32 IO returned ERROR_ALREADY_EXISTS. Path: at System.IO.File.Move (System.String sourceFileName, System.String destFileName) [0x00000] in <filename unknown>:0
at SparkleLib.Git.SparkleRepo.ResolveConflict () [0x00000] in <filename unknown>:0
at SparkleLib.Git.SparkleRepo.get_branch () [0x00000] in <filename unknown>:0
16:51:19 | Cmd | GuardianProjectPublic | git status --porcelain
16:51:19 | Cmd | GuardianProjectPublic | git status --porcelain
16:51:19 | Git | GuardianProjectPublic | Conflict type: AU Graphics/gnupg/GPGTools.png
16:51:19 | Cmd | GuardianProjectPublic | git checkout --theirs "Graphics/gnupg/GPGTools.png"
error: path 'Graphics/gnupg/GPGTools.png' does not have their version
16:51:19 | Git | GuardianProjectPublic | Failed to resolve conflict, trying again...: Win32 IO returned ERROR_ALREADY_EXISTS. Path: at System.IO.File.Move (System.String sourceFileName, System.String destFileName) [0x00000] in <filename unknown>:0
at SparkleLib.Git.SparkleRepo.ResolveConflict () [0x00000] in <filename unknown>:0
at SparkleLib.Git.SparkleRepo.get_branch () [0x00000] in <filename unknown>:0
16:51:19 | Cmd | GuardianProjectPublic | git status --porcelain
16:51:19 | Cmd | GuardianProjectPublic | git status --porcelain
16:51:19 | Git | GuardianProjectPublic | Conflict type: AU Graphics/gnupg/GPGTools.png
16:51:19 | Cmd | GuardianProjectPublic | git checkout --theirs "Graphics/gnupg/GPGTools.png"
error: path 'Graphics/gnupg/GPGTools.png' does not have their version
16:51:19 | Git | GuardianProjectPublic | Failed to resolve conflict, trying again...: Win32 IO returned ERROR_ALREADY_EXISTS. Path: at System.IO.File.Move (System.String sourceFileName, System.String destFileName) [0x00000] in <filename unknown>:0
at SparkleLib.Git.SparkleRepo.ResolveConflict () [0x00000] in <filename unknown>:0
at SparkleLib.Git.SparkleRepo.get_branch () [0x00000] in <filename unknown>:0
16:51:19 | Cmd | GuardianProjectPublic | git status --porcelain
16:51:19 | Cmd | GuardianProjectPublic | git status --porcelain
16:51:19 | Git | GuardianProjectPublic | Conflict type: AU Graphics/gnupg/GPGTools.png
16:51:19 | Cmd | GuardianProjectPublic | git checkout --theirs "Graphics/gnupg/GPGTools.png"
error: path 'Graphics/gnupg/GPGTools.png' does not have their version
16:51:19 | Git | GuardianProjectPublic | Failed to resolve conflict, trying again...: Win32 IO returned ERROR_ALREADY_EXISTS. Path: at System.IO.File.Move (System.String sourceFileName, System.String destFileName) [0x00000] in <filename unknown>:0
at SparkleLib.Git.SparkleRepo.ResolveConflict () [0x00000] in <filename unknown>:0
at SparkleLib.Git.SparkleRepo.get_branch () [0x00000] in <filename unknown>:0
16:51:19 | Cmd | GuardianProjectPublic | git status --porcelain
16:51:19 | Cmd | GuardianProjectPublic | git status --porcelain
16:51:19 | Git | GuardianProjectPublic | Conflict type: AU Graphics/gnupg/GPGTools.png
16:51:19 | Cmd | GuardianProjectPublic | git checkout --theirs "Graphics/gnupg/GPGTools.png"
error: path 'Graphics/gnupg/GPGTools.png' does not have their version
16:51:19 | Git | GuardianProjectPublic | Failed to resolve conflict, trying again...: Win32 IO returned ERROR_ALREADY_EXISTS. Path: at System.IO.File.Move (System.String sourceFileName, System.String destFileName) [0x00000] in <filename unknown>:0
at SparkleLib.Git.SparkleRepo.ResolveConflict () [0x00000] in <filename unknown>:0
at SparkleLib.Git.SparkleRepo.get_branch () [0x00000] in <filename unknown>:0
16:51:19 | Cmd | GuardianProjectPublic | git status --porcelain
16:51:19 | Cmd | GuardianProjectPublic | git status --porcelain
16:51:19 | Git | GuardianProjectPublic | Conflict type: AU Graphics/gnupg/GPGTools.png
16:51:19 | Cmd | GuardianProjectPublic | git checkout --theirs "Graphics/gnupg/GPGTools.png"
error: path 'Graphics/gnupg/GPGTools.png' does not have their version
16:51:19 | Git | GuardianProjectPublic | Failed to resolve conflict, trying again...: Win32 IO returned ERROR_ALREADY_EXISTS. Path: at System.IO.File.Move (System.String sourceFileName, System.String destFileName) [0x00000] in <filename unknown>:0
at SparkleLib.Git.SparkleRepo.ResolveConflict () [0x00000] in <filename unknown>:0
at SparkleLib.Git.SparkleRepo.get_branch () [0x00000] in <filename unknown>:0
16:51:19 | Cmd | GuardianProjectPublic | git status --porcelain
16:51:19 | Cmd | GuardianProjectPublic | git status --porcelain
16:51:19 | Git | GuardianProjectPublic | Conflict type: AU Graphics/gnupg/GPGTools.png
16:51:19 | Cmd | GuardianProjectPublic | git checkout --theirs "Graphics/gnupg/GPGTools.png"
error: path 'Graphics/gnupg/GPGTools.png' does not have their version
16:51:19 | Git | GuardianProjectPublic | Failed to resolve conflict, trying again...: Win32 IO returned ERROR_ALREADY_EXISTS. Path: at System.IO.File.Move (System.String sourceFileName, System.String destFileName) [0x00000] in <filename unknown>:0
at SparkleLib.Git.SparkleRepo.ResolveConflict () [0x00000] in <filename unknown>:0
at SparkleLib.Git.SparkleRepo.get_branch () [0x00000] in <filename unknown>:0
16:51:19 | Cmd | GuardianProjectPublic | git status --porcelain
16:51:19 | Cmd | GuardianProjectPublic | git status --porcelain
16:51:19 | Git | GuardianProjectPublic | Conflict type: AU Graphics/gnupg/GPGTools.png
16:51:19 | Cmd | GuardianProjectPublic | git checkout --theirs "Graphics/gnupg/GPGTools.png"
error: path 'Graphics/gnupg/GPGTools.png' does not have their version
16:51:19 | Git | GuardianProjectPublic | Failed to resolve conflict, trying again...: Win32 IO returned ERROR_ALREADY_EXISTS. Path: at System.IO.File.Move (System.String sourceFileName, System.String destFileName) [0x00000] in <filename unknown>:0
at SparkleLib.Git.SparkleRepo.ResolveConflict () [0x00000] in <filename unknown>:0
at SparkleLib.Git.SparkleRepo.get_branch () [0x00000] in <filename unknown>:0
16:51:19 | Cmd | GuardianProjectPublic | git status --porcelain
16:51:19 | Cmd | GuardianProjectPublic | git status --porcelain
16:51:19 | Git | GuardianProjectPublic | Conflict type: AU Graphics/gnupg/GPGTools.png
16:51:19 | Cmd | GuardianProjectPublic | git checkout --theirs "Graphics/gnupg/GPGTools.png"
error: path 'Graphics/gnupg/GPGTools.png' does not have their version
16:51:19 | Git | GuardianProjectPublic | Failed to resolve conflict, trying again...: Win32 IO returned ERROR_ALREADY_EXISTS. Path: at System.IO.File.Move (System.String sourceFileName, System.String destFileName) [0x00000] in <filename unknown>:0
at SparkleLib.Git.SparkleRepo.ResolveConflict () [0x00000] in <filename unknown>:0
at SparkleLib.Git.SparkleRepo.get_branch () [0x00000] in <filename unknown>:0
16:51:19 | Cmd | GuardianProjectPublic | git status --porcelain
16:51:20 | Cmd | GuardianProjectPublic | git status --porcelain
16:51:20 | Git | GuardianProjectPublic | Conflict type: AU Graphics/gnupg/GPGTools.png
16:51:20 | Cmd | GuardianProjectPublic | git checkout --theirs "Graphics/gnupg/GPGTools.png"
error: path 'Graphics/gnupg/GPGTools.png' does not have their version
16:51:20 | Git | GuardianProjectPublic | Failed to resolve conflict, trying again...: Win32 IO returned ERROR_ALREADY_EXISTS. Path: at System.IO.File.Move (System.String sourceFileName, System.String destFileName) [0x00000] in <filename unknown>:0
at SparkleLib.Git.SparkleRepo.ResolveConflict () [0x00000] in <filename unknown>:0
at SparkleLib.Git.SparkleRepo.get_branch () [0x00000] in <filename unknown>:0
16:51:20 | Cmd | GuardianProjectPublic | git status --porcelain
16:51:20 | Cmd | GuardianProjectPublic | git status --porcelain
16:51:20 | Git | GuardianProjectPublic | Conflict type: AU Graphics/gnupg/GPGTools.png
16:51:20 | Cmd | GuardianProjectPublic | git checkout --theirs "Graphics/gnupg/GPGTools.png"
error: path 'Graphics/gnupg/GPGTools.png' does not have their version
16:51:20 | Git | GuardianProjectPublic | Failed to resolve conflict, trying again...: Win32 IO returned ERROR_ALREADY_EXISTS. Path: at System.IO.File.Move (System.String sourceFileName, System.String destFileName) [0x00000] in <filename unknown>:0
at SparkleLib.Git.SparkleRepo.ResolveConflict () [0x00000] in <filename unknown>:0
at SparkleLib.Git.SparkleRepo.get_branch () [0x00000] in <filename unknown>:0
16:51:20 | Cmd | GuardianProjectPublic | git status --porcelain
16:51:20 | Cmd | GuardianProjectPublic | git status --porcelain
16:51:20 | Git | GuardianProjectPublic | Conflict type: AU Graphics/gnupg/GPGTools.png
16:51:20 | Cmd | GuardianProjectPublic | git checkout --theirs "Graphics/gnupg/GPGTools.png"
error: path 'Graphics/gnupg/GPGTools.png' does not have their version
16:51:20 | Git | GuardianProjectPublic | Failed to resolve conflict, trying again...: Win32 IO returned ERROR_ALREADY_EXISTS. Path: at System.IO.File.Move (System.String sourceFileName, System.String destFileName) [0x00000] in <filename unknown>:0
at SparkleLib.Git.SparkleRepo.ResolveConflict () [0x00000] in <filename unknown>:0
at SparkleLib.Git.SparkleRepo.get_branch () [0x00000] in <filename unknown>:0
16:51:20 | Cmd | GuardianProjectPublic | git status --porcelain
16:51:20 | Cmd | GuardianProjectPublic | git status --porcelain
16:51:20 | Git | GuardianProjectPublic | Conflict type: AU Graphics/gnupg/GPGTools.png
16:51:20 | Cmd | GuardianProjectPublic | git checkout --theirs "Graphics/gnupg/GPGTools.png"
error: path 'Graphics/gnupg/GPGTools.png' does not have their version
16:51:20 | Git | GuardianProjectPublic | Failed to resolve conflict, trying again...: Win32 IO returned ERROR_ALREADY_EXISTS. Path: at System.IO.File.Move (System.String sourceFileName, System.String destFileName) [0x00000] in <filename unknown>:0
at SparkleLib.Git.SparkleRepo.ResolveConflict () [0x00000] in <filename unknown>:0
at SparkleLib.Git.SparkleRepo.get_branch () [0x00000] in <filename unknown>:0
16:51:20 | Cmd | GuardianProjectPublic | git status --porcelain
16:51:20 | Cmd | GuardianProjectPublic | git status --porcelain
16:51:20 | Git | GuardianProjectPublic | Conflict type: AU Graphics/gnupg/GPGTools.png
16:51:20 | Cmd | GuardianProjectPublic | git checkout --theirs "Graphics/gnupg/GPGTools.png"
error: path 'Graphics/gnupg/GPGTools.png' does not have their version
16:51:20 | Git | GuardianProjectPublic | Failed to resolve conflict, trying again...: Win32 IO returned ERROR_ALREADY_EXISTS. Path: at System.IO.File.Move (System.String sourceFileName, System.String destFileName) [0x00000] in <filename unknown>:0
at SparkleLib.Git.SparkleRepo.ResolveConflict () [0x00000] in <filename unknown>:0
at SparkleLib.Git.SparkleRepo.get_branch () [0x00000] in <filename unknown>:0
16:51:20 | Cmd | GuardianProjectPublic | git status --porcelain
16:51:20 | Cmd | GuardianProjectPublic | git status --porcelain
16:51:20 | Git | GuardianProjectPublic | Conflict type: AU Graphics/gnupg/GPGTools.png
16:51:20 | Cmd | GuardianProjectPublic | git checkout --theirs "Graphics/gnupg/GPGTools.png"
error: path 'Graphics/gnupg/GPGTools.png' does not have their version
16:51:20 | Git | GuardianProjectPublic | Failed to resolve conflict, trying again...: Win32 IO returned ERROR_ALREADY_EXISTS. Path: at System.IO.File.Move (System.String sourceFileName, System.String destFileName) [0x00000] in <filename unknown>:0
at SparkleLib.Git.SparkleRepo.ResolveConflict () [0x00000] in <filename unknown>:0
at SparkleLib.Git.SparkleRepo.get_branch () [0x00000] in <filename unknown>:0
16:51:20 | Cmd | GuardianProjectPublic | git status --porcelain
16:51:20 | Cmd | GuardianProjectPublic | git status --porcelain
16:51:20 | Git | GuardianProjectPublic | Conflict type: AU Graphics/gnupg/GPGTools.png
16:51:20 | Cmd | GuardianProjectPublic | git checkout --theirs "Graphics/gnupg/GPGTools.png"
error: path 'Graphics/gnupg/GPGTools.png' does not have their version
16:51:20 | Git | GuardianProjectPublic | Failed to resolve conflict, trying again...: Win32 IO returned ERROR_ALREADY_EXISTS. Path: at System.IO.File.Move (System.String sourceFileName, System.String destFileName) [0x00000] in <filename unknown>:0
at SparkleLib.Git.SparkleRepo.ResolveConflict () [0x00000] in <filename unknown>:0
at SparkleLib.Git.SparkleRepo.get_branch () [0x00000] in <filename unknown>:0
16:51:21 | Cmd | GuardianProjectPublic | git status --porcelain
16:51:21 | Cmd | GuardianProjectPublic | git status --porcelain
16:51:21 | Git | GuardianProjectPublic | Conflict type: AU Graphics/gnupg/GPGTools.png
16:51:21 | Cmd | GuardianProjectPublic | git checkout --theirs "Graphics/gnupg/GPGTools.png"
error: path 'Graphics/gnupg/GPGTools.png' does not have their version
16:51:21 | Git | GuardianProjectPublic | Failed to resolve conflict, trying again...: Win32 IO returned ERROR_ALREADY_EXISTS. Path: at System.IO.File.Move (System.String sourceFileName, System.String destFileName) [0x00000] in <filename unknown>:0
at SparkleLib.Git.SparkleRepo.ResolveConflict () [0x00000] in <filename unknown>:0
at SparkleLib.Git.SparkleRepo.get_branch () [0x00000] in <filename unknown>:0
16:51:21 | Cmd | GuardianProjectPublic | git status --porcelain
16:51:21 | Cmd | GuardianProjectPublic | git status --porcelain
16:51:21 | Git | GuardianProjectPublic | Conflict type: AU Graphics/gnupg/GPGTools.png
16:51:21 | Cmd | GuardianProjectPublic | git checkout --theirs "Graphics/gnupg/GPGTools.png"
error: path 'Graphics/gnupg/GPGTools.png' does not have their version
16:51:21 | Git | GuardianProjectPublic | Failed to resolve conflict, trying again...: Win32 IO returned ERROR_ALREADY_EXISTS. Path: at System.IO.File.Move (System.String sourceFileName, System.String destFileName) [0x00000] in <filename unknown>:0
at SparkleLib.Git.SparkleRepo.ResolveConflict () [0x00000] in <filename unknown>:0
at SparkleLib.Git.SparkleRepo.get_branch () [0x00000] in <filename unknown>:0
16:51:21 | Cmd | GuardianProjectPublic | git status --porcelain
16:51:21 | Cmd | GuardianProjectPublic | git status --porcelain
16:51:21 | Git | GuardianProjectPublic | Conflict type: AU Graphics/gnupg/GPGTools.png
16:51:21 | Cmd | GuardianProjectPublic | git checkout --theirs "Graphics/gnupg/GPGTools.png"
error: path 'Graphics/gnupg/GPGTools.png' does not have their version
16:51:21 | Git | GuardianProjectPublic | Failed to resolve conflict, trying again...: Win32 IO returned ERROR_ALREADY_EXISTS. Path: at System.IO.File.Move (System.String sourceFileName, System.String destFileName) [0x00000] in <filename unknown>:0
at SparkleLib.Git.SparkleRepo.ResolveConflict () [0x00000] in <filename unknown>:0
at SparkleLib.Git.SparkleRepo.get_branch () [0x00000] in <filename unknown>:0
16:51:21 | Cmd | GuardianProjectPublic | git status --porcelain
16:51:21 | Cmd | GuardianProjectPublic | git status --porcelain
16:51:21 | Git | GuardianProjectPublic | Conflict type: AU Graphics/gnupg/GPGTools.png
16:51:21 | Cmd | GuardianProjectPublic | git checkout --theirs "Graphics/gnupg/GPGTools.png"
error: path 'Graphics/gnupg/GPGTools.png' does not have their version
16:51:21 | Git | GuardianProjectPublic | Failed to resolve conflict, trying again...: Win32 IO returned ERROR_ALREADY_EXISTS. Path: at System.IO.File.Move (System.String sourceFileName, System.String destFileName) [0x00000] in <filename unknown>:0
at SparkleLib.Git.SparkleRepo.ResolveConflict () [0x00000] in <filename unknown>:0
at SparkleLib.Git.SparkleRepo.get_branch () [0x00000] in <filename unknown>:0
16:51:21 | Cmd | GuardianProjectPublic | git status --porcelain
16:51:21 | Cmd | GuardianProjectPublic | git status --porcelain
16:51:21 | Git | GuardianProjectPublic | Conflict type: AU Graphics/gnupg/GPGTools.png
16:51:21 | Cmd | GuardianProjectPublic | git checkout --theirs "Graphics/gnupg/GPGTools.png"
error: path 'Graphics/gnupg/GPGTools.png' does not have their version
16:51:21 | Git | GuardianProjectPublic | Failed to resolve conflict, trying again...: Win32 IO returned ERROR_ALREADY_EXISTS. Path: at System.IO.File.Move (System.String sourceFileName, System.String destFileName) [0x00000] in <filename unknown>:0
at SparkleLib.Git.SparkleRepo.ResolveConflict () [0x00000] in <filename unknown>:0
at SparkleLib.Git.SparkleRepo.get_branch () [0x00000] in <filename unknown>:0
16:51:21 | Cmd | GuardianProjectPublic | git status --porcelain
16:51:21 | Cmd | GuardianProjectPublic | git status --porcelain
16:51:21 | Git | GuardianProjectPublic | Conflict type: AU Graphics/gnupg/GPGTools.png
16:51:21 | Cmd | GuardianProjectPublic | git checkout --theirs "Graphics/gnupg/GPGTools.png"
error: path 'Graphics/gnupg/GPGTools.png' does not have their version
16:51:21 | Git | GuardianProjectPublic | Failed to resolve conflict, trying again...: Win32 IO returned ERROR_ALREADY_EXISTS. Path: at System.IO.File.Move (System.String sourceFileName, System.String destFileName) [0x00000] in <filename unknown>:0
at SparkleLib.Git.SparkleRepo.ResolveConflict () [0x00000] in <filename unknown>:0
at SparkleLib.Git.SparkleRepo.get_branch () [0x00000] in <filename unknown>:0
16:51:21 | Cmd | GuardianProjectPublic | git status --porcelain
16:51:21 | Cmd | GuardianProjectPublic | git status --porcelain
16:51:21 | Git | GuardianProjectPublic | Conflict type: AU Graphics/gnupg/GPGTools.png
16:51:21 | Cmd | GuardianProjectPublic | git checkout --theirs "Graphics/gnupg/GPGTools.png"
error: path 'Graphics/gnupg/GPGTools.png' does not have their version
16:51:21 | Git | GuardianProjectPublic | Failed to resolve conflict, trying again...: Win32 IO returned ERROR_ALREADY_EXISTS. Path: at System.IO.File.Move (System.String sourceFileName, System.String destFileName) [0x00000] in <filename unknown>:0
at SparkleLib.Git.SparkleRepo.ResolveConflict () [0x00000] in <filename unknown>:0
at SparkleLib.Git.SparkleRepo.get_branch () [0x00000] in <filename unknown>:0
Host key fingerprint is 66:4e:21:80:30:8f:a6:5e:1b:ea:f6:f2:9b:0f:5f:ec
+--[ RSA 2048]----+
|o. .. |
| +. . |
|... . . |
|o . . |
|. o S |
|. o o .= |
| o o o. |
|.o + o |
|..+=oo E |
+-----------------+
16:51:21 | Cmd | GuardianProjectPublic | git status --porcelain
16:51:21 | Cmd | GuardianProjectPublic | git status --porcelain
16:51:21 | Git | GuardianProjectPublic | Conflict type: AU Graphics/gnupg/GPGTools.png
16:51:21 | Cmd | GuardianProjectPublic | git checkout --theirs "Graphics/gnupg/GPGTools.png"
error: path 'Graphics/gnupg/GPGTools.png' does not have their version
16:51:21 | Git | GuardianProjectPublic | Failed to resolve conflict, trying again...: Win32 IO returned ERROR_ALREADY_EXISTS. Path: at System.IO.File.Move (System.String sourceFileName, System.String destFileName) [0x00000] in <filename unknown>:0
at SparkleLib.Git.SparkleRepo.ResolveConflict () [0x00000] in <filename unknown>:0
at SparkleLib.Git.SparkleRepo.get_branch () [0x00000] in <filename unknown>:0
16:51:21 | Cmd | GuardianProjectPublic | git status --porcelain
16:51:22 | Cmd | GuardianProjectPublic | git status --porcelain
16:51:22 | Git | GuardianProjectPublic | Conflict type: AU Graphics/gnupg/GPGTools.png
16:51:22 | Cmd | GuardianProjectPublic | git checkout --theirs "Graphics/gnupg/GPGTools.png"
error: path 'Graphics/gnupg/GPGTools.png' does not have their version
16:51:22 | Git | GuardianProjectPublic | Failed to resolve conflict, trying again...: Win32 IO returned ERROR_ALREADY_EXISTS. Path: at System.IO.File.Move (System.String sourceFileName, System.String destFileName) [0x00000] in <filename unknown>:0
at SparkleLib.Git.SparkleRepo.ResolveConflict () [0x00000] in <filename unknown>:0
at SparkleLib.Git.SparkleRepo.get_branch () [0x00000] in <filename unknown>:0
16:51:22 | Cmd | GuardianProjectPublic | git status --porcelain
16:51:22 | Cmd | GuardianProjectPublic | git status --porcelain
16:51:22 | Git | GuardianProjectPublic | Conflict type: AU Graphics/gnupg/GPGTools.png
16:51:22 | Cmd | GuardianProjectPublic | git checkout --theirs "Graphics/gnupg/GPGTools.png"
error: path 'Graphics/gnupg/GPGTools.png' does not have their version
16:51:22 | Git | GuardianProjectPublic | Failed to resolve conflict, trying again...: Win32 IO returned ERROR_ALREADY_EXISTS. Path: at System.IO.File.Move (System.String sourceFileName, System.String destFileName) [0x00000] in <filename unknown>:0
at SparkleLib.Git.SparkleRepo.ResolveConflict () [0x00000] in <filename unknown>:0
at SparkleLib.Git.SparkleRepo.get_branch () [0x00000] in <filename unknown>:0
16:51:22 | Cmd | GuardianProjectPublic | git status --porcelain
16:51:22 | Cmd | GuardianProjectPublic | git status --porcelain
16:51:22 | Git | GuardianProjectPublic | Conflict type: AU Graphics/gnupg/GPGTools.png
16:51:22 | Cmd | GuardianProjectPublic | git checkout --theirs "Graphics/gnupg/GPGTools.png"
error: path 'Graphics/gnupg/GPGTools.png' does not have their version
16:51:22 | Git | GuardianProjectPublic | Failed to resolve conflict, trying again...: Win32 IO returned ERROR_ALREADY_EXISTS. Path: at System.IO.File.Move (System.String sourceFileName, System.String destFileName) [0x00000] in <filename unknown>:0
at SparkleLib.Git.SparkleRepo.ResolveConflict () [0x00000] in <filename unknown>:0
at SparkleLib.Git.SparkleRepo.get_branch () [0x00000] in <filename unknown>:0
16:51:22 | Cmd | GuardianProjectPublic | git status --porcelain
16:51:22 | Cmd | GuardianProjectPublic | git status --porcelain
16:51:22 | Git | GuardianProjectPublic | Conflict type: AU Graphics/gnupg/GPGTools.png
16:51:22 | Cmd | GuardianProjectPublic | git checkout --theirs "Graphics/gnupg/GPGTools.png"
error: path 'Graphics/gnupg/GPGTools.png' does not have their version
16:51:22 | Git | GuardianProjectPublic | Failed to resolve conflict, trying again...: Win32 IO returned ERROR_ALREADY_EXISTS. Path: at System.IO.File.Move (System.String sourceFileName, System.String destFileName) [0x00000] in <filename unknown>:0
at SparkleLib.Git.SparkleRepo.ResolveConflict () [0x00000] in <filename unknown>:0
at SparkleLib.Git.SparkleRepo.get_branch () [0x00000] in <filename unknown>:0
16:51:22 | Cmd | GuardianProjectPublic | git status --porcelain
16:51:22 | Cmd | GuardianProjectPublic | git status --porcelain
16:51:22 | Git | GuardianProjectPublic | Conflict type: AU Graphics/gnupg/GPGTools.png
16:51:22 | Cmd | GuardianProjectPublic | git checkout --theirs "Graphics/gnupg/GPGTools.png"
error: path 'Graphics/gnupg/GPGTools.png' does not have their version
16:51:22 | Git | GuardianProjectPublic | Failed to resolve conflict, trying again...: Win32 IO returned ERROR_ALREADY_EXISTS. Path: at System.IO.File.Move (System.String sourceFileName, System.String destFileName) [0x00000] in <filename unknown>:0
at SparkleLib.Git.SparkleRepo.ResolveConflict () [0x00000] in <filename unknown>:0
at SparkleLib.Git.SparkleRepo.get_branch () [0x00000] in <filename unknown>:0
16:51:22 | Cmd | GuardianProjectPublic | git status --porcelain
16:51:22 | Cmd | GuardianProjectPublic | git status --porcelain
16:51:22 | Git | GuardianProjectPublic | Conflict type: AU Graphics/gnupg/GPGTools.png
16:51:22 | Cmd | GuardianProjectPublic | git checkout --theirs "Graphics/gnupg/GPGTools.png"
error: path 'Graphics/gnupg/GPGTools.png' does not have their version
16:51:22 | Git | GuardianProjectPublic | Failed to resolve conflict, trying again...: Win32 IO returned ERROR_ALREADY_EXISTS. Path: at System.IO.File.Move (System.String sourceFileName, System.String destFileName) [0x00000] in <filename unknown>:0
at SparkleLib.Git.SparkleRepo.ResolveConflict () [0x00000] in <filename unknown>:0
at SparkleLib.Git.SparkleRepo.get_branch () [0x00000] in <filename unknown>:0
16:51:22 | Cmd | GuardianProjectPublic | git status --porcelain
16:51:22 | Cmd | GuardianProjectPublic | git status --porcelain
16:51:22 | Git | GuardianProjectPublic | Conflict type: AU Graphics/gnupg/GPGTools.png
16:51:22 | Cmd | GuardianProjectPublic | git checkout --theirs "Graphics/gnupg/GPGTools.png"
error: path 'Graphics/gnupg/GPGTools.png' does not have their version
16:51:22 | Git | GuardianProjectPublic | Failed to resolve conflict, trying again...: Win32 IO returned ERROR_ALREADY_EXISTS. Path: at System.IO.File.Move (System.String sourceFileName, System.String destFileName) [0x00000] in <filename unknown>:0
at SparkleLib.Git.SparkleRepo.ResolveConflict () [0x00000] in <filename unknown>:0
at SparkleLib.Git.SparkleRepo.get_branch () [0x00000] in <filename unknown>:0
16:51:22 | Cmd | GuardianProjectPublic | git status --porcelain
16:51:22 | Cmd | GuardianProjectPublic | git status --porcelain
16:51:22 | Git | GuardianProjectPublic | Conflict type: AU Graphics/gnupg/GPGTools.png
16:51:22 | Cmd | GuardianProjectPublic | git checkout --theirs "Graphics/gnupg/GPGTools.png"
error: path 'Graphics/gnupg/GPGTools.png' does not have their version
16:51:22 | Git | GuardianProjectPublic | Failed to resolve conflict, trying again...: Win32 IO returned ERROR_ALREADY_EXISTS. Path: at System.IO.File.Move (System.String sourceFileName, System.String destFileName) [0x00000] in <filename unknown>:0
at SparkleLib.Git.SparkleRepo.ResolveConflict () [0x00000] in <filename unknown>:0
at SparkleLib.Git.SparkleRepo.get_branch () [0x00000] in <filename unknown>:0
16:51:22 | Cmd | GuardianProjectPublic | git status --porcelain
16:51:22 | Cmd | GuardianProjectPublic | git status --porcelain
16:51:23 | Git | GuardianProjectPublic | Conflict type: AU Graphics/gnupg/GPGTools.png
16:51:23 | Cmd | GuardianProjectPublic | git checkout --theirs "Graphics/gnupg/GPGTools.png"
error: path 'Graphics/gnupg/GPGTools.png' does not have their version
16:51:23 | Git | GuardianProjectPublic | Failed to resolve conflict, trying again...: Win32 IO returned ERROR_ALREADY_EXISTS. Path: at System.IO.File.Move (System.String sourceFileName, System.String destFileName) [0x00000] in <filename unknown>:0
at SparkleLib.Git.SparkleRepo.ResolveConflict () [0x00000] in <filename unknown>:0
at SparkleLib.Git.SparkleRepo.get_branch () [0x00000] in <filename unknown>:0
16:51:23 | Cmd | GuardianProjectPublic | git status --porcelain
16:51:23 | Cmd | GuardianProjectPublic | git status --porcelain
16:51:23 | Git | GuardianProjectPublic | Conflict type: AU Graphics/gnupg/GPGTools.png
16:51:23 | Cmd | GuardianProjectPublic | git checkout --theirs "Graphics/gnupg/GPGTools.png"
error: path 'Graphics/gnupg/GPGTools.png' does not have their version
16:51:23 | Git | GuardianProjectPublic | Failed to resolve conflict, trying again...: Win32 IO returned ERROR_ALREADY_EXISTS. Path: at System.IO.File.Move (System.String sourceFileName, System.String destFileName) [0x00000] in <filename unknown>:0
at SparkleLib.Git.SparkleRepo.ResolveConflict () [0x00000] in <filename unknown>:0
at SparkleLib.Git.SparkleRepo.get_branch () [0x00000] in <filename unknown>:0
16:51:23 | Cmd | GuardianProjectPublic | git status --porcelain
16:51:23 | Cmd | GuardianProjectPublic | git status --porcelain
16:51:23 | Git | GuardianProjectPublic | Conflict type: AU Graphics/gnupg/GPGTools.png
16:51:23 | Cmd | GuardianProjectPublic | git checkout --theirs "Graphics/gnupg/GPGTools.png"
error: path 'Graphics/gnupg/GPGTools.png' does not have their version
16:51:23 | Git | GuardianProjectPublic | Failed to resolve conflict, trying again...: Win32 IO returned ERROR_ALREADY_EXISTS. Path: at System.IO.File.Move (System.String sourceFileName, System.String destFileName) [0x00000] in <filename unknown>:0
at SparkleLib.Git.SparkleRepo.ResolveConflict () [0x00000] in <filename unknown>:0
at SparkleLib.Git.SparkleRepo.get_branch () [0x00000] in <filename unknown>:0
16:51:23 | Cmd | GuardianProjectPublic | git status --porcelain
16:51:23 | Cmd | GuardianProjectPublic | git status --porcelain
16:51:23 | Git | GuardianProjectPublic | Conflict type: AU Graphics/gnupg/GPGTools.png
16:51:23 | Cmd | GuardianProjectPublic | git checkout --theirs "Graphics/gnupg/GPGTools.png"
error: path 'Graphics/gnupg/GPGTools.png' does not have their version
16:51:23 | Git | GuardianProjectPublic | Failed to resolve conflict, trying again...: Win32 IO returned ERROR_ALREADY_EXISTS. Path: at System.IO.File.Move (System.String sourceFileName, System.String destFileName) [0x00000] in <filename unknown>:0
at SparkleLib.Git.SparkleRepo.ResolveConflict () [0x00000] in <filename unknown>:0
at SparkleLib.Git.SparkleRepo.get_branch () [0x00000] in <filename unknown>:0
16:51:23 | Cmd | GuardianProjectPublic | git status --porcelain
16:51:23 | Cmd | GuardianProjectPublic | git status --porcelain
16:51:23 | Git | GuardianProjectPublic | Conflict type: AU Graphics/gnupg/GPGTools.png
16:51:23 | Cmd | GuardianProjectPublic | git checkout --theirs "Graphics/gnupg/GPGTools.png"
error: path 'Graphics/gnupg/GPGTools.png' does not have their version
16:51:23 | Git | GuardianProjectPublic | Failed to resolve conflict, trying again...: Win32 IO returned ERROR_ALREADY_EXISTS. Path: at System.IO.File.Move (System.String sourceFileName, System.String destFileName) [0x00000] in <filename unknown>:0
at SparkleLib.Git.SparkleRepo.ResolveConflict () [0x00000] in <filename unknown>:0
at SparkleLib.Git.SparkleRepo.get_branch () [0x00000] in <filename unknown>:0
16:51:23 | Cmd | GuardianProjectPublic | git status --porcelain
16:51:23 | Cmd | GuardianProjectPublic | git status --porcelain
16:51:23 | Git | GuardianProjectPublic | Conflict type: AU Graphics/gnupg/GPGTools.png
16:51:23 | Cmd | GuardianProjectPublic | git checkout --theirs "Graphics/gnupg/GPGTools.png"
error: path 'Graphics/gnupg/GPGTools.png' does not have their version
16:51:23 | Git | GuardianProjectPublic | Failed to resolve conflict, trying again...: Win32 IO returned ERROR_ALREADY_EXISTS. Path: at System.IO.File.Move (System.String sourceFileName, System.String destFileName) [0x00000] in <filename unknown>:0
at SparkleLib.Git.SparkleRepo.ResolveConflict () [0x00000] in <filename unknown>:0
at SparkleLib.Git.SparkleRepo.get_branch () [0x00000] in <filename unknown>:0
16:51:23 | Cmd | GuardianProjectPublic | git status --porcelain
16:51:23 | Cmd | GuardianProjectPublic | git status --porcelain
16:51:23 | Git | GuardianProjectPublic | Conflict type: AU Graphics/gnupg/GPGTools.png
16:51:23 | Cmd | GuardianProjectPublic | git checkout --theirs "Graphics/gnupg/GPGTools.png"
error: path 'Graphics/gnupg/GPGTools.png' does not have their version
16:51:23 | Git | GuardianProjectPublic | Failed to resolve conflict, trying again...: Win32 IO returned ERROR_ALREADY_EXISTS. Path: at System.IO.File.Move (System.String sourceFileName, System.String destFileName) [0x00000] in <filename unknown>:0
at SparkleLib.Git.SparkleRepo.ResolveConflict () [0x00000] in <filename unknown>:0
at SparkleLib.Git.SparkleRepo.get_branch () [0x00000] in <filename unknown>:0
16:51:23 | Cmd | GuardianProjectPublic | git status --porcelain
16:51:23 | Cmd | GuardianProjectPublic | git status --porcelain
16:51:23 | Git | GuardianProjectPublic | Conflict type: AU Graphics/gnupg/GPGTools.png
16:51:23 | Cmd | GuardianProjectPublic | git checkout --theirs "Graphics/gnupg/GPGTools.png"
error: path 'Graphics/gnupg/GPGTools.png' does not have their version
16:51:23 | Git | GuardianProjectPublic | Failed to resolve conflict, trying again...: Win32 IO returned ERROR_ALREADY_EXISTS. Path: at System.IO.File.Move (System.String sourceFileName, System.String destFileName) [0x00000] in <filename unknown>:0
at SparkleLib.Git.SparkleRepo.ResolveConflict () [0x00000] in <filename unknown>:0
at SparkleLib.Git.SparkleRepo.get_branch () [0x00000] in <filename unknown>:0
16:51:23 | Cmd | GuardianProjectPublic | git status --porcelain
16:51:23 | Cmd | GuardianProjectPublic | git status --porcelain
16:51:24 | Git | GuardianProjectPublic | Conflict type: AU Graphics/gnupg/GPGTools.png
16:51:24 | Cmd | GuardianProjectPublic | git checkout --theirs "Graphics/gnupg/GPGTools.png"
error: path 'Graphics/gnupg/GPGTools.png' does not have their version
16:51:24 | Git | GuardianProjectPublic | Failed to resolve conflict, trying again...: Win32 IO returned ERROR_ALREADY_EXISTS. Path: at System.IO.File.Move (System.String sourceFileName, System.String destFileName) [0x00000] in <filename unknown>:0
at SparkleLib.Git.SparkleRepo.ResolveConflict () [0x00000] in <filename unknown>:0
at SparkleLib.Git.SparkleRepo.get_branch () [0x00000] in <filename unknown>:0
16:51:24 | Cmd | GuardianProjectPublic | git status --porcelain
16:51:24 | Cmd | GuardianProjectPublic | git status --porcelain
16:51:24 | Git | GuardianProjectPublic | Conflict type: AU Graphics/gnupg/GPGTools.png
16:51:24 | Cmd | GuardianProjectPublic | git checkout --theirs "Graphics/gnupg/GPGTools.png"
error: path 'Graphics/gnupg/GPGTools.png' does not have their version
16:51:24 | Git | GuardianProjectPublic | Failed to resolve conflict, trying again...: Win32 IO returned ERROR_ALREADY_EXISTS. Path: at System.IO.File.Move (System.String sourceFileName, System.String destFileName) [0x00000] in <filename unknown>:0
at SparkleLib.Git.SparkleRepo.ResolveConflict () [0x00000] in <filename unknown>:0
at SparkleLib.Git.SparkleRepo.get_branch () [0x00000] in <filename unknown>:0
16:51:24 | Cmd | GuardianProjectPublic | git status --porcelain
16:51:24 | Cmd | GuardianProjectPublic | git status --porcelain
16:51:24 | Git | GuardianProjectPublic | Conflict type: AU Graphics/gnupg/GPGTools.png
16:51:24 | Cmd | GuardianProjectPublic | git checkout --theirs "Graphics/gnupg/GPGTools.png"
error: path 'Graphics/gnupg/GPGTools.png' does not have their version
16:51:24 | Git | GuardianProjectPublic | Failed to resolve conflict, trying again...: Win32 IO returned ERROR_ALREADY_EXISTS. Path: at System.IO.File.Move (System.String sourceFileName, System.String destFileName) [0x00000] in <filename unknown>:0
at SparkleLib.Git.SparkleRepo.ResolveConflict () [0x00000] in <filename unknown>:0
at SparkleLib.Git.SparkleRepo.get_branch () [0x00000] in <filename unknown>:0
16:51:24 | Cmd | GuardianProjectPublic | git status --porcelain
16:51:24 | Cmd | GuardianProjectPublic | git status --porcelain
16:51:24 | Git | GuardianProjectPublic | Conflict type: AU Graphics/gnupg/GPGTools.png
16:51:24 | Cmd | GuardianProjectPublic | git checkout --theirs "Graphics/gnupg/GPGTools.png"
error: path 'Graphics/gnupg/GPGTools.png' does not have their version
16:51:24 | Git | GuardianProjectPublic | Failed to resolve conflict, trying again...: Win32 IO returned ERROR_ALREADY_EXISTS. Path: at System.IO.File.Move (System.String sourceFileName, System.String destFileName) [0x00000] in <filename unknown>:0
at SparkleLib.Git.SparkleRepo.ResolveConflict () [0x00000] in <filename unknown>:0
at SparkleLib.Git.SparkleRepo.get_branch () [0x00000] in <filename unknown>:0
16:51:24 | Cmd | GuardianProjectPublic | git status --porcelain
16:51:24 | Cmd | GuardianProjectPublic | git status --porcelain
16:51:24 | Git | GuardianProjectPublic | Conflict type: AU Graphics/gnupg/GPGTools.png
16:51:24 | Cmd | GuardianProjectPublic | git checkout --theirs "Graphics/gnupg/GPGTools.png"
error: path 'Graphics/gnupg/GPGTools.png' does not have their version
16:51:24 | Git | GuardianProjectPublic | Failed to resolve conflict, trying again...: Win32 IO returned ERROR_ALREADY_EXISTS. Path: at System.IO.File.Move (System.String sourceFileName, System.String destFileName) [0x00000] in <filename unknown>:0
at SparkleLib.Git.SparkleRepo.ResolveConflict () [0x00000] in <filename unknown>:0
at SparkleLib.Git.SparkleRepo.get_branch () [0x00000] in <filename unknown>:0
16:51:24 | Cmd | GuardianProjectPublic | git status --porcelain
16:51:24 | Cmd | GuardianProjectPublic | git status --porcelain
16:51:24 | Git | GuardianProjectPublic | Conflict type: AU Graphics/gnupg/GPGTools.png
16:51:24 | Cmd | GuardianProjectPublic | git checkout --theirs "Graphics/gnupg/GPGTools.png"
error: path 'Graphics/gnupg/GPGTools.png' does not have their version
16:51:24 | Git | GuardianProjectPublic | Failed to resolve conflict, trying again...: Win32 IO returned ERROR_ALREADY_EXISTS. Path: at System.IO.File.Move (System.String sourceFileName, System.String destFileName) [0x00000] in <filename unknown>:0
at SparkleLib.Git.SparkleRepo.ResolveConflict () [0x00000] in <filename unknown>:0
at SparkleLib.Git.SparkleRepo.get_branch () [0x00000] in <filename unknown>:0
16:51:24 | Cmd | GuardianProjectPublic | git status --porcelain
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment