Magnus BÃck-2 wrote: > > > Don't do the merge in the server-side bare git, do it somewhere you've > made a non-bare clone that has a worktree. A workstation would be the > best choice, but you could make such a clone on the server too (but I'd > avoid introducing a process in an organization that required people to > be able to logon to the Git server). Once you've actually done the merge > you can push the merge commit to the master branch of > ssh://git@server/git/project.git. > > To deal with upstreams like this I recommend you place the upstream > branch(es) in a separate namespace prefixed by <upstreamname>/, e.g. > github/master if your upstream is the master branch from the official > Github repo of the project. Example: > > git fetch ssh://git@xxxxxxxx/git/project.git > git push ssh://git@server/git/project.git FETCH_HEAD:github/master > > If you mirror the upstream branches like this on your server merges > from upstream becomes trivial[*], > > git merge origin/github/master > git push ssh://git@server/git/project.git HEAD:master > > and can be done on any workstation plus it's easy for your users to > e.g. see what they've been up to compared to the upstream: > > git log origin/github/master..origin/master > [...] > Could you explain more about how this works - where do I find the character string to use instead of "github". It can't be arbitrary, I got an error message. When I did the fetch it said *branch HEAD -> FETCH_HEAD could you explain what this means in more detail? We enthusiasts-who-don't-have-time-to-become-git-masters really need some well explained examples if we're going to be able to convince management that git is not some super complicated tool that takes weeks to learn. The particular use case described in this thread is the last sticking point I have to make work before I can show git doing everything we need it to do to my management. -- View this message in context: http://git.661346.n2.nabble.com/merging-bare-repository-tp6358945p6421097.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 majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html