Hi Tom, I'm afraid I don't really understand the use-case here, or what these clusters are about. But it sounds like multiple users have to share one work tree (meaning non-bare) repository. Am I right?
While this sounds like highly unusual workflow (usually people have their own separate repositories), perhaps using git stash could help: *work work on Feature A* git stash save "Feature A work in progress" git pull --rebase (avoiding merge commit) *work work on Feature B* git stash save "Feature B in progress" git stash pop stash@{0} (feature A) *work more on Feature A" git add -A git commit -m "Feature A" If that isn't of any help to you, could you try explaining again what you are trying to do, with some more examples? -- You received this message because you are subscribed to the Google Groups "Git for human beings" group. To view this discussion on the web visit https://groups.google.com/d/msg/git-users/-/XZEZ9pYV6uAJ. To post to this group, send email to git-users@googlegroups.com. To unsubscribe from this group, send email to git-users+unsubscr...@googlegroups.com. For more options, visit this group at http://groups.google.com/group/git-users?hl=en.