Hi all, being fairly new to the whole git/github thing, I still haven't figured out to use, follow development of, and enhance tracks all at the same time in a decent way.
I have a tracks repo on git ( http://github.com/Dieterbe/tracks/tree/master ), which is a fork of bsag/master, and I have git cloned this onto my local system. Right now I have basically 2 branches: master and bsag/master, from the latter I pull frequently to get the latest 1.7-dev fixes. The problem lies mainly in my own master branch: I merge bsag/master into this, but I also do my own work in this and use this branch to actually use tracks. I use tracks-15-blank.db to store my data. So this means each time I need to commit I need to backup the file, delete all my data from it, so it becomes 'generic' and I can commit my stuff and then restore the backup. I tried git stash but upon restore usually this is the result: warning: Cannot merge binary files: Updated upstream:db/tracks-15-blank.db vs. Stashed changes:db/tracks-15-blank.db Auto-merged db/tracks-15-blank.db CONFLICT (content): Merge conflict in db/tracks-15-blank.db The result is that db/tracks-15-blank.db is the original one, not the one with my data' Yesterday I figured out how to be able to get the version from the stash back (iirc i had to delete the file from the index and physically delete the file but i'm not sure anymore) But anyway, this is not the best approach I guess. Are there best practices for stuff like this? recommended workflows? Should I make another branch containing my personal data and keep master clean and always publishable? But then how do I make sure my personal branch is never published on github? Afaik all branches in my clone will be on github or am I wrong? Thanks, Dieter _______________________________________________ Tracks-discuss mailing list [email protected] http://lists.rousette.org.uk/mailman/listinfo/tracks-discuss
