I was wondering if you were able to apply some of your great experience with some suggestions on my programming setup at the moment. I'm a 1 man band and here's how I work at the moment:
Work computer: Github + Atom
Home computer: Github + Atom
Raspberry Pi's: Github
All of the above are synced to the same github repository. I only really use github at the moment as a way of tracking my changes and an easy way to transfer the code across machines.
I always run into problems with conflicts, as expected, when moving across machines to code.
i.e. I work away at work pushing changes to Github and pulling them down to my Raspberry Pis to test and adjust the code as I go. If I need to I'll then shutdown the Pi's, carry them home and carry on working on my Home laptop.
Here's the problems I get:
Each time I make a change to the code from my Work laptop I have to 'reset' the repository on my Pi's as they complain about merge conflicts. I do this with the following:
The second one, when I move to my Home laptop I struggle to get Atom to pull down any new changes and ignore any local changes. I'm not sure where these changes are happening as I make sure I do a 'push' before closing it down on both my Work and Home laptops.
Code: Select all
git pull origin/master; git reset --hard master/origin; git pull origin/master; my_script_that_I_want_to_test
I've thought about cutting out Github and using a file sharing sync tool, but we use Google Drive at work and I believe that there isn't a Linux friendly version for it.
Is there something simple I'm missing or another way that I can do this?