Github desktop

Does someone have a good workflow for developing using github desktop.
I’m always running into conflicts when I do a PR and I don’t know how to resolve them.
Most of the time with this:

homeassistant/components/frontend/www_static/home-assistant-polymer

Thanks
Giel