I've got a particular git workflow that doesn't appear to be working like I had hoped it would. I have 2 working dirs. "connected" - most people have access to this one and data flows in and out of it "disconnected" - able to get data from "connected" here, but can't go the other way, except by patches. Attached is a shell script outlining what I'm trying to do. Note that the last step fails with a conflict. I would not have expected this given that the patch came from git and was applied by git, so I would have expected it to keep the history correct so that when data goes back to "disconnected" from "connected" git should notice that the change was one that already exists in the "disconnected" working directory. -- Jon Schewe | http://mtu.net/~jpschewe If you see an attachment named signature.asc, this is my digital signature. See http://www.gnupg.org for more information. For I am convinced that neither death nor life, neither angels nor demons, neither the present nor the future, nor any powers, neither height nor depth, nor anything else in all creation, will be able to separate us from the love of God that is in Christ Jesus our Lord. - Romans 8:38-39 -------------- next part -------------- A non-text attachment was scrubbed... Name: test.sh Type: application/x-sh Size: 998 bytes Desc: not available Url : http://mailman.mn-linux.org/pipermail/tclug-list/attachments/20100216/acaebc01/attachment.sh