I have conflict on the GIT then i try merge code, but not showing what lines conflicting. my file and main branch source file is equal line by line..
Asked
Active
Viewed 80 times
0
Your choice
- 395
- 12
- 25
-
2It might be related to spaces. One of your developers might be spacing with tabs, and the other with spaces. – Ozair Kafray Jan 23 '15 at 09:57
-
can i now merge forced without fixing it ? – Your choice Jan 23 '15 at 10:00
-
1or execution rights. If somehow on the way (file systems, `chmod`, ...) the file changed permissions from `rw-rw-rw-` to `rwxrwxrwx`, that might be a source, too. – Boldewyn Jan 23 '15 at 10:00
-
1@Yourchoice Yes, you can, but first investigate and tell us if that is the reason OR what Boldewyn has said? – Ozair Kafray Jan 23 '15 at 10:08
-
1It could be that the file no longer exists on the branch you are trying to merge into. In other words, it could be a "tree" conflict, rather than a content conflict. – John Szakmeister Jan 23 '15 at 10:18
-
works changed file permisions :) – Your choice Jan 23 '15 at 10:21