Инструменты пользователя

Инструменты сайта


Содержание

SubGit

Разные советы и рекомендации. Хорошие практики.

Слияния

Выключить в git репозитории Fast Forward Merge:

  git config merge.ff false

Это упредит от ошибки вида:

remote: The following ref update is disallowed:
remote:   refs/heads/master: leads to replacement of SVN branch 'trunk'
remote: 
remote: If changes were forcefully pushed to Git repository, try to merge them with the upstream instead;
remote: If changes were result of fast-forward merge, retry merge with --no-ff option.

Подробнее: https://stackoverflow.com/questions/38926427/jira-subversion-mirror-subgit-remote-error-on-push