30
votes
6answers
1k views

Are Frequent Complicated Merge Conflicts A Sign of Problems?

On our team, we use Git as our source control. We have several areas of code that are almost independent but have some overlap. Lately we have been discussing workflows and approaches to using source ...
3
votes
2answers
360 views

Good Version Control Guidelines from a Development/Collaboration Perspective?

At our company we have started outsourcing some of our development. This has worked somewhat well. However, we are having a hard time getting them to properly use version control. They are familiar ...
22
votes
7answers
1k views

how to stay efficient when a build is almost always broken

I work in a middle sized team which shares the same source code and while have a continues integration in place, but as all of us has to work in the same branch, the build is almost always broken. ...
2
votes
3answers
291 views

Did a bunch of wrong work, should I keep it? [closed]

I have forked a repo and branched that clone to code a story, and because I didn't understand the problem, wrote code that isn't solving my task at hand, but may prove useful later. Should I: ...
0
votes
2answers
161 views

Agile project management, agile development: early integration

I believe that agile works if everything is agile. In software development area, in my opinion, if team members' code is integrated early, code will be more in sync and this has a lot of pros: ...
5
votes
3answers
1k views

Git workflow for small teams

I'm working on a git workflow to implement in a small team. The core ideas in the workflow: there is a shared project master that all team members can write to all development is done exclusively on ...
8
votes
2answers
252 views

Bulk commits vs Quick commits [closed]

I know that most of you would advice to go with the strategy and methodology of the project. However I just have a quick question, from Senior point of view, what would be better to see quick small ...
12
votes
4answers
851 views

How should code “Goal Tending” be handled by a Development Manager?

First allow me to coin a term: code goal-tending: Checking out code in the morning, then silently reviewing all of the changes made by the other developers the previous day file by file, ...
9
votes
3answers
1k views

Github Organization Repositories, Issues, Multiple Developers, and Forking - Best Workflow Practices

A weird title, yes, but I've got a bit of ground to cover I think. We have an organization account on github with private repositories. We want to use github's native issues/pull-requests features ...
37
votes
15answers
4k views

How can I convince cowboy programmers to use source control?

UPDATE I work on a small team of devs, 4 guys. They have all used source control. Most of them can't stand source control and instead choose not to use it. I strongly believe source control is a ...
0
votes
3answers
386 views

Version Control Workflow (Subversion)

I've been learning how to use subversion and would just like someone to clarify whether or not my understanding is correct? Create a master repository at a given location (be it on a webserver or ...
9
votes
9answers
2k views

Bitbucket and a small development house

I am in the process of finally rolling Mercurial as our version control system at work. This is a huge deal for everyone as, shockingly, they have never used a VCS. After months of putting the bug in ...
13
votes
14answers
1k views

What is the most effective/efficient way to develop an application with multiple people without source control?

Introduction to my situation I work for a small web development company. We have a team of four ASP.NET developers, including me. Almost all of our projects (> 98%) are one-person projects that take ...
10
votes
7answers
884 views

Easy way of engaging non-programmers (i.e. designers) into using version control?

What are some key ways of getting your team involved in using version control during development, web development or otherwise? I refuse to work without it, which means anyone involved in the project ...