protecting files with multiple authors in Git
Posted: Fri Apr 21, 2017 12:17 pm
Hi all,
I just got Git up and running this week. We will be using Git without binding to Flare, and I'm wondering what's the best way to keep things safe.
Background: J and I recently started at a company where we replaced the previous writers. We are each responsible for one product line, and the flare projects are currently separate. J's project has a very messy SVN implementation bound to Flare, and mine wasn't actually backed up. We decided to get my stuff in Git, then add a clean version of J's project. I created/linked a global project with our shared styles & pages, and got my project into Git and tested the heck out of it. I use the Git command line mostly, but I have SourceTree as well.
Sometime soon we will get J's project in Git linked to the same global project. At this point with just the two of us, we know better than to do anything with the other project without permission. But what do you do when there's more people or you're both working on the same project at the same time? If Git doesn't do checkouts, how do you protect the information? Somebody mentioned branching and merging, but doesn't that get messy? We were already planning on using branching to segregate different release versions.
I appreciate any advice!
thanks,
- lisa
I just got Git up and running this week. We will be using Git without binding to Flare, and I'm wondering what's the best way to keep things safe.
Background: J and I recently started at a company where we replaced the previous writers. We are each responsible for one product line, and the flare projects are currently separate. J's project has a very messy SVN implementation bound to Flare, and mine wasn't actually backed up. We decided to get my stuff in Git, then add a clean version of J's project. I created/linked a global project with our shared styles & pages, and got my project into Git and tested the heck out of it. I use the Git command line mostly, but I have SourceTree as well.
Sometime soon we will get J's project in Git linked to the same global project. At this point with just the two of us, we know better than to do anything with the other project without permission. But what do you do when there's more people or you're both working on the same project at the same time? If Git doesn't do checkouts, how do you protect the information? Somebody mentioned branching and merging, but doesn't that get messy? We were already planning on using branching to segregate different release versions.
I appreciate any advice!
thanks,
- lisa