Geek Answers Handbook

Git Conflict Resolution Merge Shows Phase Changes I Didn't

Assume the following scenario.

  • I am cloning the central branch of git repo and checkout master.
  • I am making some changes to the main branch in my local repo and commit.
  • Other people make changes in the main branch, commit and click on the central repo
  • I am trying to pull the main branch of the central repo to mine.
  • Confluence of conflicts occurs.

Then, if I issue a command git status, I see that many changes (which, it seems to me, were made by other people in step 3) that I did not make, are automatically set for the next merge, which I intend to do after resolving the conflicts.

My question is that after resolving the conflict and taking action, the aforementioned changes that were made but not implemented by me, go to the repo, as if they were made by me?

+4
source share
2 answers

Each time you merge, a commit is created. Doing an attraction is efficient extraction and merging (unless you use fast redirects).

- , ( ). , git . , , . , , .

, , , , , , .

+3

, git config

autocrlf, , , ( ), .

autocrlf = false
# or with this
git config --global core.autocrlf true

,

filemode = false

. git

.git/config
+1

More articles:


All Articles