2
votes
git: checking merge conflicts WITHOUT actually doing the merge
Merging is not "just merging". You can choose different strategies to merge branches, and I'm afraid that the git is unable to predict (figure out) conflicts before the branches are actually ...
Only top scored, non community-wiki answers of a minimum length are eligible
Related Tags
git × 1132ssh × 199
linux × 109
ubuntu × 81
gitlab × 80
github × 67
apache-2.2 × 59
gitolite × 54
centos × 44
nginx × 42
windows × 41
debian × 39
permissions × 38
jenkins × 36
deployment × 35
svn × 34
ssh-keys × 30
amazon-web-services × 26
bash × 26
repository × 24
version-control × 24
amazon-ec2 × 23
backup × 19
configuration × 19
hook × 19