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.

Comments

Post a Comment

Popular posts from this blog

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

jQuery Deferred Object method chain or a Syntactic Sugar

By -
The live samples: Chain animation Group async animation Piece of code: function doAnimation () { var duration = 2000; var host = jQuery(".host"); var img = host.children(); jQuery . when ( img .fadeOut(duration)) . then (function () { return host .delay(duration) .slideUp(duration) .delay(duration); }) . then (function () { return host .delay(duration) .slideDown(duration); }) . then (function () { return img .delay(duration) .fadeIn(duration) .delay(duration); }) . then (function () { // it3xl.ru: !The Recursion. doAnimation (); }) ; } I have the next thoughts. Prerequisites 1. The Deprecated and The Removed Let's omit all deprecated and removed functions, parameters, objects etс. See the documentation and be aware of it. Current version of the jQuery is the 1.9.1. 2. The Deferred is everywhere in the j...
Read more

Ctrl+Shift+Right arrow doesn't work in Visual Studio 2019

By -
Image
I can't select words to the right by using the standard shortcut Ctrl+Shift+Right arrow . By the way, words selection to the left with Ctrl+Shift+Left arrow works well. Probably, the ReSharper keyboard layout creates this trouble. I fixed it in Tools > Options window. Select Environment > Keyboard and past  Edit.WordNextExtend into the "Show commands containing" field. Then proceed as shown by the red arrows in the following image.
Read more