changed what Eclipse will push.  The bin and gen folders should not be pushed or pulled because these are generated on any change and git will recognise any differences in these as conflicts
Did the same thing in the support folder, removing the generated files from git push and pull.  Through Eclipse the command is right click on the folder or file, team, advanced, untrack