Logo Questions Linux Laravel Mysql Ubuntu Git Menu
 

Merge code changes without true source control

We have a few developers working on the same VS2005 solution, but our source control is very bad. (Our company uses Harvest, which we give a vote of no confidence).

Right now, we're all just working off of the files on a shared lan drive. Obviously, this causes some problems. But we think it's better than working locally, and tracking the files we touched in a spreadsheet and merging everything manually. Does anybody have a strategy for merging our changes?

Some of the problems exist because of corporate beaurocracy (like mandating Harvest). Those same policies prevent introducing new tools into our environment. So, strategies that avoid buying/downloading new software would work best for us.

like image 777
Jim Avatar asked Oct 14 '08 17:10

Jim


People also ask

Why do we need source control?

Source control (or version control) is the practice of tracking and managing changes to code. Source control management (SCM) systems provide a running history of code development and help to resolve conflicts when merging contributions from multiple sources.

How do you merge coding?

Merging code allows multiple software developers to integrate changes into their codebase. Developers start this process by branching from a shared codeline, often referred to as a mainline. Then once work the work is completed and tested, the branch is merged back into the codebase.

What is source control in Visual Studio?

The Source Control API allows extension authors to define Source Control Management (SCM) features. There is a slim, yet powerful API surface which allows many different SCM systems to be integrated in Visual Studio Code, while having a common user interface with all of them.


1 Answers

Learn to use Harvest. It takes a little effort to get things going smoothly but overall it is an excellent source control system.

like image 138
user8035 Avatar answered Sep 28 '22 20:09

user8035