A problem that git pull cannot understand

1. I did an experiment, first commit, and then pull, and FETCH_HEAD different situations. Then I use the first pull below to report an error directly without merging. The second is automatic merge, but there may be conflicts.

xxx:test_git horsen$ git pull origin developer:test1
From xxx! [rejected] developer-> test1 (non-fast-forward)
xxx:test_git horsen$ git pull origin developer
From xxxx * branch developer-> FETCH_HEAD Auto-merging ttt1.txt CONFLICT (content): Merge conflict in ttt1.txt Automatic
merge failed; fix conflicts and then commit the result.

2. The second kind of question
is that the current branch is omitted. Isn"t the first reasonable way of writing equivalent to the second way of writing

Why can the second kind merge, the second kind of direct rejected

I hope the boss will solve the problem, thank you

Programmer front-end back-end git

Nov.05,2021

git pull is actually git fetch + git merge
, so.. You can use the git merge origin developer:test1?
git merge command to merge from the specified commit to the current branch . Note that it is the current branch. You cannot specify to merge to other branches to

Previous: Why do big factories use more react? Are you considering compatibility or other reasons?

Next: WeChat Mini Programs page data rendering

MySQL Query : SELECT * FROM `codeshelper`.`v9_news` WHERE status=99 AND catid='6' ORDER BY rand() LIMIT 5
MySQL Error : Disk full (/tmp/#sql-temptable-64f5-1b30ea6-2b4cd.MAI); waiting for someone to free some space... (errno: 28 "No space left on device")
MySQL Errno : 1021
Message : Disk full (/tmp/#sql-temptable-64f5-1b30ea6-2b4cd.MAI); waiting for someone to free some space... (errno: 28 "No space left on device")
Need Help?