#it3xl

This page explains how to use the Pure Git with Convention over Git  solution to synchronize Git remote repositories. Or how to live with Git remote repositories auto synchronized by it. But consider to use  git-sinc , the next generation of remote Git repositories synchronization. How to work with the Convention over Git Use Git, as you always do, except for the following. Name branches and tags with a prefix of your side (as an example " company/ some_branch_name "). Do plain commits to prefixed branches of your side. Delete only branches and tags of your side. Deleted by you refs from other sides will be recreated automatically. How to migrate your work to another side refs All refs will be updated on all sides automatically. But when you will want to migrate your work to another side, you will do one of the following. By a merge or cherry-pick from your side Do a plain merge from you prefixed branch to a prefixed branch of another side. ...

Convention over Git  or  CoG  influences on automated conflict solving during automated synchronization of remote Git repositories. Naming convention The Convention over Git uses naming to define owners of Git-branches. More often I use prefixed names for this. I.e. each remote Git repository owns its prefix. (It allows for all non-fast-forward Git-conflicts to be solved in favor of a prefix owner.) Examples Let's say one team uses prefix "company1/". (Git allows you have slashes in branch names) And another team uses "company2-". For this we may have flogging synchronized Git-branches. company1/develop vs company2-develop company1/JIRA-123 vs company2-JIRA-321 or simply company1/my-cool-feature company2-my-bug-fixing So, a naming convention in Git can be any conventional separation of names. It depends on you implementation. I use prefixes in my implementations. Results Conventions over Git gives many advantages and drastically ...

This is a cheat-sheet for a simplest implementation of the Convention over Git  and of the  pure Git and the Convention over Git . This is used for an automated synchronization between remote Git repositories. (Consider to use  git-sinc , the next generation of remote Git repositories synchronization.) If you understand the idea of the Convention over Git , then it is easier to look at this cheat-sheet. Otherwise look at the Convention over Git  article and on the project's home page . Here we'll start. Let's say some two development teams in companies "A -1 " and "B -2 " want to auto-synchronize a Git-repository named " repo " with each other. We have some preconditions: The teams want to synchronize only conventionally named branches. Not the entire repository, which is also possible. GitLab of one of the teams automatically blocks tags deletion. So, they decided to exclude Git-tags from syncing. Guys have no time for optimizati...