Hi, I'm working on project with another developer. Until now, we didn't have any issues with git. We pulled and pushed normally. Since a few days, when I pull, I get the files modified by the other developer but they are put into an "merging branch" and git asks me to fix the conflicts. I don't why git detects conflicts because I don't work on the files the other developer is working on...
here's an abstract of what git tells me : Auto-merging htdocs/themes/***/css/styles.min.css CONFLICT (content): Merge conflict in htdocs/themes/***/css/styles.min.css Automatic merge failed; fix conflicts and then commit the result. Max-3:www Maxime$ git status # On branch master # Your branch and 'origin/master' have diverged, # and have 2 and 1 different commit each, respectively. # (use "git pull" to merge the remote branch into yours) # # All conflicts fixed but you are still merging. # (use "git commit" to conclude merge) # # Changes to be committed: # # modified: htdocs/themes/***/css/styles.less # modified: htdocs/themes/***/css/styles.min.css # modified: htdocs/themes/***/views/blog-article.tpl.php # # Changes not staged for commit: # (use "git add <file>..." to update what will be committed) # (use "git checkout -- <file>..." to discard changes in working directory) # # modified: htdocs/themes/***/css/styles.css # -- You received this message because you are subscribed to the Google Groups "Git for human beings" group. To unsubscribe from this group and stop receiving emails from it, send an email to git-users+unsubscr...@googlegroups.com. For more options, visit https://groups.google.com/d/optout.
