Off topic, but let me know if at any point you would like to compare workflows and what has worked for us/you guys. At first I was a bit wary of DVCS, honestly, but now that I have played around with git and am becoming more comfortable with it, I must admit I really quite like it. Anyways, I know this doesn't answer your question directly, but maybe these things provide a bit of a work around. So, when resolving conflicts, "theirs" is actually your feature branch copy, because the branch you have checked out has changed somewhat unbeknownst to you as part of the rebase. I should also note something that has caused some headache a couple times is that if you rebase, the first thing it does is checkout the base branch. I then do a diff on the conflicting files, resolve diffs on disk in my feature branch copy, then select my copy in Source Tree to resolve the conflict. I checkout the base branch in one clone, and my feature branch in the other. I think this is essentially what the first like I posted does for you, but I'm not positive. One drawback here is dependencies of the remote copy of the VI will be missing, Another thing I have done is cloned the repo twice on disk. Sometimes it's enough for me to just visually look at the before and after (selecting them from within Source Tree) and tweak what I need to in my copy, then choose mine to resolve the conflict. I could see it becoming more of a problem if there were lots of changes made, but we have been trying to commit and sync up frequently so that things aren't too out of whack. I can tell you what I've been doing, which is a bit tedious but has worked ok.
Below are some relevant posts which you may have seen already. I got about as far as you as well, but couldn't really get things to work. I'm not sure that I'm really all that close, honestly. SourceTree reports errors on start-up, so don't use this! Lol! path = C:Program Files (x86)National InstrumentsSharedLabVIEW CompareLVCompare.exe keepBackup = false trustExitCode = false cmd = "C:Program Files (x86)National InstrumentsSharedLabVIEW CompareLVCompare.exe" "$LOCAL" "$REMOTE" tool = LVCompare This seems like it could be a significant drawback. For the purposes of this discussion it might be more helpful to share the relevant text in the .gitconfig file (and any associated scripts, if necessary).Īs others have mentioned, Git itself (SourceTree similarly) does not distinguish which diff tool to call according to the file extension.
I use the Atlassian SourceTree client at present (and sometimes the shell).
#Sourcetree diff how to
Anyway, I think I've learned some things trying to figure out how to get this to work-but I don't have it working yet. I have been using Git for a few months now with reasonable success and decided I should try to set up graphical differencing. My new employer is moving to Git (some good, some bad in that, in my opinion, but that is another topic). I know how to configure TortoiseSVN to work with LVCompare and LVMerge. Has anyone actually configured Git to work with LVCompare or LVMerge? (I've seen some threads on various boards saying it "should be something like", but it isn't quite and I haven't found anywhere that someone has actually described it successfully.)
0 kommentar(er)
