VS2015 and git

Saga 431 Reputation points
2021-08-09T21:20:56.07+00:00

Hi all,

I am involved in a project that uses VS2015 and git. With some digging and help from this group I now have a git "server" and one developer station with Windows 7 and VS 2015. The git "server" is another PC on the same LAN running Win 10. I've done the following so far:

  • Installed git on the server and workstation
  • Created a folder on the server and shared specifically with developer users.
  • Set up both local repository on dev station and on the server in the shared folder
  • Setup VS2015 to use git and defined the remote master/origin repository on the shared folder

Here is a rough sketch of the development environment that I am wanting to create:

121627-devsetup.png

Each workstation will have git installed, along with a local repository and VS2015.
The server will also have git installed, with a repository that will be the origin/master. VS2015 not installed here.

The workflow will look something like the following:

Master copy of the source will reside on the shared folder of the server
A developer with a project will clone, or pull, or fetch that master copy onto his/her station
Developer will make changes to project, add files and commit changes
Developer will push committed changes to master/origin on remote repository
Admin will inspect push and accept or reject source code changes

Where I need help is in the following:

Verify that my work flow proposal makes sense and is mainstream practice
Determine how the developer is going perform the steps described above

I am looking for any documentation or references that I can use to better understand how git can work give the dev environment described in this post. I do not have previous experience with git software version control. The above workflow seems doable enough, but I am not sure I am succeeding when implementing it. Then there is the matter of branches. Most likely, I will want the developer to create a new branch for his/her project and then merge with the master at the end of the project.

My goals is to have the developers do all the above steps within VS, but if not possible, I'll have them drop into the command line and provide the necessary git commands. My objective here is to perform all git housekeeping task within VS. We are moving from a proprietary development platform to Visual Studio, so I am looking to keep it as simple as possible to mitigate culture shock, but fully understand that we'll be facing a learning curve when using this new platform and will be willing to use git tools as needed.

I have done a few tests. I have successfully created a new project with the git checkbox checked and have pushed changes to master/origin; however, I am not able to locate documentation explaining details on the general process, such as the difference among push, pull and sync. I am also unable to get the source from the git server to the local repository. I suspect that I'll have to use the command line for this, but want to be sure before I introduce this added variable.

Any recommendations are appreciated. I have gotten far in this project, and am grateful for the previous help.

Saga

Developer technologies | Visual Studio | Other
0 comments No comments
{count} votes

Your answer

Answers can be marked as Accepted Answers by the question author, which helps users to know the answer solved the author's problem.