Hi I am new to git, trying to see if I can use it at my work place to replace Starteam. There is only one Starteam feature that I miss, comparing it to git: shared files. Most projects, here, use lot of shared files, and Starteam handle these pretty easily. You just check in (commit + push in git terms) these files in Starteam central repo and every project that "share" them see these as "out-of-date" (so you know you have to "check out" (pull)). Very handy. For every other aspect (not least ... ehm .. the price) Git seems better to me: it handles much better moving and creating files, and I like the distributed and "tree-oriented" approach better. But shared files are a problem. After lot of google search I came to the idea of using git subtree, to achieve the same results of Starteam shared files. So I have created 4 remote bare repositories, 1 for the main app and 3 for the shared files parts. After making some changes in shared files though I got in trouble: subtree push keeps give me this error:
error: failed to push some refs to '//vm2003test/OuvertureWebShared/Ouverture' hint: Updates were rejected because the tip of your current branch is behind hint: its remote counterpart. Merge the remote changes (e.g. 'git pull') hint: before pushing again. hint: See the 'Note about fast-forwards' in 'git push --help' for details. Obviously I have already made the pull command (as suggested in the message) and it says to me that everything is up to date. On SO there is the very same question (http://stackoverflow.com/questions/13756055/git-subtree-subtree-up-to-date-but-cant-push) but I was unable to try the proposed solution since my git client (GitExtensions on windows) does not support apparently the grave accent. Moreover I don't actually understand that workaround. Thanks for any help Bye Nicola -- View this message in context: http://git.661346.n2.nabble.com/Help-with-subtree-pull-push-tp7611751.html Sent from the git mailing list archive at Nabble.com. -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
