I have two repositories, one local, another one published (e.g. on CodePlex). The local repository is a large codebase and forms part of a framework, the published repository is a subset only contains about 5%. For the files that differ, they do so in a minor way (comments, namespaces, etc.).
How can I (a) determine if a repository has changed since my last merge; and (b) merge between the two repositories so changes in either get pushed back? I thought about making patches for single files but this is very much manual work. If I do end up making changes in each repository by doing a manual merge, how do I record in git that a merge was made? -- You received this message because you are subscribed to the Google Groups "Git for human beings" group. To unsubscribe from this group and stop receiving emails from it, send an email to git-users+unsubscr...@googlegroups.com. For more options, visit https://groups.google.com/d/optout.
