betskrot.blogg.se - Git file merge tool

#Git file merge tool install#

Thus, behaviour so far undefined.Ĭommit changes, will increment commit-count. Not tested are pull-merges, and behaviour if multiple users are working on the same repository remotely. The tests will take a while (~20 minutes) as there is a lot going on in the background to check whether the tool is correctly working (git merges, commits, adds, stashes, etc.) You can and should try to download and run the tests.sh in a safe folder before using the tool for any project! Run more than 50 tests to check whether the tool would work on this machine.

Perform the install-script actions for each test.

Delete the git repository in the current folder if there is any!!!.

Add an alias to "git" to the ~/.bashrc file, if not already exists.

and delete the sample hooks in the git repository.

Copy the files of ersioning_hooks/ into.

Make a new git repository in the current folder!.

#Git file merge tool install#

This tool should not be used for production work, rather use it on your personal computer for private use, especially to get used to the tool and its behaviour! The install script does following! Merge complex changes with backwards-incompatibility to the master branch. Merge feature-bundles with backwards-compatibility to the major branch. You will recognize the minor-version-number going up.

Then you can simply start developing and when you finish a feature, merge it to the minor branch. Best for a new git repository: Install the tool with the installscripts, which will also make the new repository for you. A complex tool for easy use of semantic versioning with git.