These commits are related to the fact that your colleague did some work in his local branch, and then pulled out new commits from the remote control. The key is that git pull is a combination of the two git commands, git fetch and git merge . As a rule, these commits are quite harmless, but in my experience they sometimes cause some problems.
The end can be avoided by running git pull --rebase origin master . This makes extrusion a combination of git fetch and git rebase . This will cancel the local commits and commit to the remote control, then apply the local commits one at a time. As for the commits that you already have on your remote, you can try to clear them with an interactive reinstall, but this will cause more problems than it's worth. I would just try to change the workflow of co-organizers and leave them on the remote control. Changing the overall story is risky and can be a painful process.
I wouldn’t become a cherry - take a comment if you just take for yourself that your colleague was fine with you. Although I usually prefer merging branches instead of trying to make cherry picks, as this leads to fixations that have the same patch with different sha and can lead to merging branches to be harder than it should be.
source share