Attention: Answers.ros.org is deprecated as of August the 11th, 2023. Please visit robotics.stackexchange.com to ask a new question. This site will remain online in read-only mode during the transition and into the foreseeable future. Selected questions and answers have been migrated, and redirects have been put in place to direct users to the corresponding questions on Robotics Stack Exchange. Additional details are available here.

Revision history [back]

What do you mean by conflicted files. I'm not using git, but if you are referrring to unversioned files, there should not be many. Usually it is the build/ directory that should be ignored, maybe also lib/ and bin/. Maybe you commited the build/ directory and are now getting a lot of conflicts there. You can leave that out of the repository.

ROS Answers is licensed under Creative Commons Attribution 3.0 Content on this site is licensed under a Creative Commons Attribution Share Alike 3.0 license.