Rob Lancaster replied to the topic 'AstroPi3 Scripts revised' in the forum. 3 years ago

So since you modified the cmakelists, if you do a git pull and nobody changes that file, then you are fine and it will merge with the other changes. But if somebody edits cmakelists,txt, you might have to undo your change or delete the file, or reset the repo before doing the git pull. You will know that it is a problem because it will refuse to git pull in that case.

Read More...