Prop development and git

ke4pjw

Anyone using git for source control of their prop development?

Any pointers on the best way to do it?

I am moving all of my code to Visual Studio Team Services.

SRLM

I don't think there's anything special about using git for Propeller development. It's just another language. Here's a few of my projects:

https://github.com/libpropeller/libpropeller
https://github.com/Red9/scad

There's also PropWare:

https://github.com/parallaxinc/PropWare

In general, most software developers seem to roughly follow this basic model:

http://nvie.com/posts/a-successful-git-branching-model/

ke4pjw

git is a version control system. Visual Studio Team Services allows for free hosting into a git repository.

Responding before understanding what you wrote. My bad.

I was kind of hoping someone had some pointers one good methods/tools/plugins for managing prop development with git. Most professional tools allow you to check code into and out of git repos. A git plugin for the PropellerIDE would be super sweet, but it does not exist.

I can use the CLI tools or gitGUI.

DavidZemon

CLI or the git gui are both reasonable options. Since I program in C++ and use PropWare - a CMake build system - CLion makes perfect sense for me. I quite like the version control system integration provided by Jetbrains products.

You could go with any number of other graphical Git tools, such as those offered by Tortoise or Atlassian. But you're right - you won't find any version control integration built into any dedicated Propeller tool such as the Propeller Tool, PropellerIDE, SimpleIDE, etc.

Tor

ke4pjw wrote: »

Anyone using git for source control of their prop development?

I do. The only issue is when the code is in UTF-16. That makes a mess of version control systems. Filtering it down to ASCII, or even UTF8 makes it work fine, so that's what I do, for code not written by myself. My own code is of course not UTF-16. I run something like this, as necessary:  

iconv -f UTF16 -t ASCII -c  -o fixedfile.spin utf16file.spin

or

iconv -f UTF16 -t UTF8 -c  -o fixedfile.spin utf16file.spin

ke4pjw

Thanks guys. I finally created the repo for the spin project in Visual Studio Team Services and was able to sync without issue.
Tor, thanks for the heads up about UTF-16 encoding.

VSTS and gitgui make this VERY easy!