Thanks for all your thought & effort, Elisa.
Syd— Tell me if I understand you about the problem and what’s not working:
1) You need to be able to identify files you’ve changed on sydb-occurs branch by comparing them against their counterparts on the dev. And you’ve figured that out—problem solved, right?
Well, not quite. As you showed me earlier, the `git diff --name-only [branch]` command lists the files that have been changed. I would like to see *what the changes were*, too. But once I have a list of files, I can probably go about the (somewhat labor-intensive) process of finding out which commits of each file are of interest and issue individual `git diff` commands.
2) You know you only want to merge one or two specific files in sydb-occurs into dev., and you’re having trouble getting that to happen. From what I can see in your commands, you’re looking at the origin/dev on your local computer and (unless I missed something here) I don’t think you’ve pulled in changes from the master (remote) dev branch. I expect that’s part of the problem here…
Nope. I tested these in fresh repos that were cloned immediately before testing each of the methods I showed in last post. So now that TEI-dev build is back to normal, as soon as Stylesheets-dev builds OK on Mr. Jenkins I will try one of the single-file-merge methods I showed last post and see if it works. (Reminder that it *looks* like the merge worked, but that `git diff` is failing to report the new change properly.)