Answer the question
In order to leave comments, you need to log in
Why does git pull always create a merge commit, even if there were no edits between pull A and pull B?
I can't solve the dilemma.
Usually there is no such problem, but on two servers, when pulling, git requires you to enter a commit message, and if you compare the commit that arrived from the remote repository with this new commit, then there are no differences between them.
As a result, with each pool, the local branch begins to overtake the remote one by one.
Perhaps something with the git config?
Tried playing around with `core.autocrlf` and `core.filemode` didn't work
color.ui=true
core.autocrlf=false
core.filemode=false
merge.ff=no
user.name=***
user.email=***
core.repositoryformatversion=0
core.filemode=false
core.bare=false
core.logallrefupdates=true
core.autocrlf=false
[email protected]***.git
remote.origin.fetch=+refs/heads/*:refs/remotes/origin/*
branch.master.remote=origin
branch.master.merge=refs/heads/master
Answer the question
In order to leave comments, you need to log in
if you compare a commit that arrived from a remote repository with this new commit, then there are no differences between them.
o--A
`--B
o--A--B--M1--E
\ / \
-C----D---M2--F
o--A--B
`--B
o--A--M1
/
...-B----C
Didn't find what you were looking for?
Ask your questionAsk a Question
731 491 924 answers to any question