From 677e5f6e12188d8479f694c3112efeeaf98c8d9d Mon Sep 17 00:00:00 2001 From: thk Date: Thu, 19 Mar 2020 08:40:32 +0000 Subject: [PATCH] Added a comment: sponsoring? --- ..._5a2d7ea060f5e1be11c39521c0a5631d._comment | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 doc/todo/more_efficient_resolution_of_trivial_export_conflicts/comment_1_5a2d7ea060f5e1be11c39521c0a5631d._comment diff --git a/doc/todo/more_efficient_resolution_of_trivial_export_conflicts/comment_1_5a2d7ea060f5e1be11c39521c0a5631d._comment b/doc/todo/more_efficient_resolution_of_trivial_export_conflicts/comment_1_5a2d7ea060f5e1be11c39521c0a5631d._comment new file mode 100644 index 0000000000..2db042e03c --- /dev/null +++ b/doc/todo/more_efficient_resolution_of_trivial_export_conflicts/comment_1_5a2d7ea060f5e1be11c39521c0a5631d._comment @@ -0,0 +1,19 @@ +[[!comment format=mdwn + username="thk" + avatar="http://cdn.libravatar.org/avatar/bfef10a428769701aeee1db978951461" + subject="sponsoring?" + date="2020-03-19T08:40:31Z" + content=""" +I am running into this problem right now. I exported a movie collection from laptop A and then a huge collection of photos from laptop B to an USB drive. Both exports ran many hours. +Now when I want to export the next collection of files, I see: + +> git annex export master --to usb-sg2 +> +> Resolving export conflict.. +> +> unexport usb-sg2 path/to/some/picture/file.jpg ok + +Do you already have a solution for this in mind? Could I speed up the implementation with sponsorship? This is a hard blocker now for me in my consolidation of our data with git-annex. I would rather not spend many nights to keep exporting and unexporting the same files over and over. + +Maybe I could hack this as a temporary workaround by manually changing the exported trees in the exports.log file? The \"conflicting\" exports are in two separate sub-trees. +"""]]