- ‘log/doctrees/2014/07/01/about.doctree’
- ‘log/doctrees/2014/07/03/definition.doctree’
- ‘log/doctrees/environment.pickle’
- ‘log/doctrees/master.doctree’
- ‘log/doctrees/pages/about.doctree’
- ‘log/doctrees/pages/links.doctree’
- ‘log/html/.buildinfo’
- ‘log/html/2014/07/01/about.html’
- ‘log/html/2014/07/03/definition.html’
- ‘log/html/_sources/2014/07/01/about.txt’
...
Conflict resolution by SparkleShare
- ‘blog/doctrees/2014/07/01/’
+ ‘blog/doctrees/2014/07/01/about.doctree’
+ ‘blog/doctrees/2014/07/03/definition.doctree’
+ ‘blog/doctrees/environment.pickle’
+ ‘blog/doctrees/master.doctree’
+ ‘blog/doctrees/pages/about.doctree’
+ ‘blog/doctrees/pages/links.doctree’
/ ‘blog/html/.buildinfo’
+ ‘blog/html/2014/07/01/about.html’
+ ‘blog/html/2014/07/03/definition.html’
...