{"thread":{"id":"36762","subject":"Help with subtree pull / push","startedAt":"2014-05-27T13:55:58Z","lastAt":"2014-05-27T13:55:58Z","messageCount":1,"participants":["nicofari64"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"242745","messageId":"1401198958683-7611751.post@n2.nabble.com","threadId":"36762","inReplyTo":null,"subject":"Help with subtree pull / push","fromName":"nicofari64","fromEmail":"nicola.farina@info-line.it","sentAt":"2014-05-27T13:55:58Z","receivedAt":"2014-05-27T13:55:58Z","isPatch":false,"sender":{"key":"nicola.farina@info-line.it","avatar":null},"body":"Hi\nI am new to git, trying to see if I can use it at my work place to replace\nStarteam.\nThere is only one Starteam feature that I miss, comparing it to git: shared\nfiles.\nMost projects, here, use lot of shared files, and Starteam handle these\npretty easily.\nYou just check in (commit + push in git terms) these files in Starteam\ncentral repo and every project that \"share\" them see these as \"out-of-date\"\n(so you know you have to \"check out\" (pull)). \nVery handy.\nFor every other aspect (not least ... ehm .. the price) Git seems better to\nme: it handles much better moving and creating files, and I like the\ndistributed and \"tree-oriented\" approach better.\nBut shared files are a problem.\nAfter lot of google search I came to the idea of using git subtree, to\nachieve the same results of Starteam shared files.\nSo I have created 4 remote bare repositories, 1 for the main app and 3 for\nthe shared files parts.\nAfter making some changes in shared files though I got in trouble:\nsubtree push keeps give me this error:\n\nerror: failed to push some refs to\n'//vm2003test/OuvertureWebShared/Ouverture'\nhint: Updates were rejected because the tip of your current branch is behind\nhint: its remote counterpart. Merge the remote changes (e.g. 'git pull')\nhint: before pushing again.\nhint: See the 'Note about fast-forwards' in 'git push --help' for details.\n\nObviously I have already made the pull command (as suggested in the message)\nand it says to me\nthat everything is up to date.\n\nOn SO there is the very same question\n(http://stackoverflow.com/questions/13756055/git-subtree-subtree-up-to-date-but-cant-push)\nbut I was unable to try the proposed solution since my git client\n(GitExtensions on windows) does not support apparently the grave accent.\nMoreover I don't actually understand that workaround.\nThanks for any help\nBye\nNicola\n\n\n\n--\nView this message in context: http://git.661346.n2.nabble.com/Help-with-subtree-pull-push-tp7611751.html\nSent from the git mailing list archive at Nabble.com.\n"}]}