Find the source of the error: git push reject: error: could not click some links

In one of the commands when working with git, we run "git push reject: error: failed to click multiple links" again and again

Go to git @ git.far-mteria.org: ledy / thakres.git! [Rejected]
b_stable → error b_stable (no fast forward): some refs to git @ git.far-mteria.org could not be pressed: ledy / thakres.git 'To prevent you from playing the story, deviations from fast forwarding were rejected. Combine remote changes (for example, "git pull") before pushing again. See 'Note on the' Forward-and-Forward 'git push -help' section for details.

Of course, we can continue with "-f" as quick'n'dirty - not really a solution.

However, we would like to know where it came from, or what is the reason for this failure.

Can't git provide details about the reason for rejection, possibly the file that is causing the conflict?

We have a suspect in .gitignore that is causing similar problems in another project.

+4
source share
3 answers

Git does not push individual files one at a time, it pushes full commit trees, as in "that's how the whole project looked at one commit, and then it looked just like the other, and now it finally looks like that."

Drawn as a commit graph, this, for example, is the most linear:

...--D--E--F--G    <-- master

, "", , "", , " " "" , , .. " ", :

...--D             <-- master

commits E, F G. , - , D, H:

...--D--H          <-- master

H : D E -through- G .

Git , , , master. git fetch , , , git merge commit M:

       H------
      /       \
...--D         M   <-- master
      \       /
       E--F--G

, , "" H:

...--D--H-E'-F'-G' <-- master

( E', F' G' " E, F G" , H - , , ).

+1

git pull, , .

+1

, , , iowait.

Is git show-branch --list --allworrying about ambiguous branch names: "warning: refname xyz is twoiguous"?

If yes, try

$ rm -rf.git / refs / heads / origin / xyz

$ git branch --set-upstream lkgr origin / xyz

0
source

All Articles