Convention over Git = CoG

By -
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 simplifies any implementation.
Possibly it is unclear at first glance, but it's worth it.

  • Please, do not migrate everything between repositories. It is absolutely not necessary and even harmful! CoG just allows to save your repositories in sanity.
  • GoG adds some level of self responsibility and implies some self management. You shouldn't control everything. Believe in your teams.

Comments

Post a Comment

Popular posts from this blog

Approaches to synchronize remote Git repositories

By -
Pure Git Implementation: Pure Git with Convention over Git It uses pure Git techniques. This one is more academic but fully working. Has some limitations. Has the smallest amount of implementation dependencies. *nix & Windows ready. Stateless Analysis Implementation: git-sync The best approach. But it has more implementation dependencies: gawk, modern bash. *nix & Windows ready. Stateful Analysis It depends on collected information about Git refs. It has a wider set of conflict solving tools. Predecessor of all other approaches. Requires a modern software language, an IDE and good programming practices. Implicit Renaming of Refs My beloved. Belongs to the Stateless Analysis. It implies convenient manual conflict solving on the run. It is kinda Git inside the Git with an additional degree of external references.
Read more

Cheat-sheet of implementation for Pure Git with Convention over Git

By -
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
Read more