0

I am working with Gitlab (GDK) and trying to update my current branch with upstream, everything works but there are 3K+ conflicts during the merge. I am sure that I just modified around 30 to 35 files then why I'm getting so many conflicts?

A little investigation reveals that most of the conflicts are due to ModeChanges (see image)'

enter image description here

This is how files look in meld

enter image description here

I'm not sure why I'm getting these conflicts, I've tried everything suggested here but still unable to resolve the issue.

Any kind of help would be appreciated in this regard.

Sajjad Umar
  • 131
  • 8
  • Does this answer your question? [How do I make Git ignore file mode (chmod) changes?](https://stackoverflow.com/questions/1580596/how-do-i-make-git-ignore-file-mode-chmod-changes) – Eyeslandic Jun 17 '20 at 11:58
  • I tried changing the fileMode config. But it didn't work for me. – Sajjad Umar Jun 17 '20 at 13:16

0 Answers0