A programming discipline for tracking, storing and retrieving revisions of source code.

learn more… | top users | synonyms (2)

5
votes
1answer
602 views

Is there an established or defined best practice for source control branching between development and production builds?

I struggled in how to phrase my question, so let me give an example in hopes of making more clear what I am after: I currently work on a dev team responsible for maintaining and adding features to a ...
8
votes
2answers
2k views

Are There Realistic/Useful Solutions for Source Control for Ladder Logic Programs

Version control for ladder logic (LL) programs for programmable logic controllers (PLCs) seems to be virtually non-existent. It may be because LL is a visual language and tends to be stored in binary ...
11
votes
3answers
504 views

How to refactor when all your development is on branches?

At my company, all of our development (bug fixes and new features) is done on separate branches. When it's complete, we send it off to QA who tests it on that branch, and when they give us the green ...
7
votes
6answers
581 views

Branching Strategy for Test Environment

We will be starting a new project this month. The project will be 1 year and production deployment will only occur towards the end of the project. We will be doing iterative development (1 month per ...
1
vote
2answers
533 views

Version Control on Windows Home Server [closed]

I'm a lone developer and am thinking about version control now. I don't particular want to pay for an online service if I don't have to, so I was thinking about using Windows Home Server as the ...
27
votes
8answers
1k views

good replacement for commenting out code? [duplicate]

It bothers me to see commented out code and it seems often-times a symptom of developers not being proficient in advanced source control features, but on the other hand source control does not really ...
3
votes
1answer
77 views

Could a reflog replace tags for bookkeeping?

My repository has a branch production and is filled with countless tags of the format production-20130101-1234 that point to what has been actually shipped on the given datetime. I think this ...
0
votes
3answers
188 views

CSS File Editing for Teams? (how to avoid stepping on each others' feet?!)

I'm wondering if anyone has a good solution for when you're working as a team and there's a single file used throughout a project (like a styles.css file) and everyone needs to use it throughout the ...
10
votes
2answers
7k views

Structure of a Git repository

Sorry if this is a duplicate, I looked. We're moving to Git. In Subversion, I'm used to having \trunk, \branches and \tags folders. With Git, switching between branches will replace the contents of ...
7
votes
3answers
301 views

Should I store test files in source control?

I have a number of (large) test files that need to be maintained. This means access to their history is a requirement. Benefits Any new developers get the entire test suite with just a git pull. ...
11
votes
2answers
2k views

How can I organize personal git repositories?

I'm in the process of setting up a GitHub account with the plan of making a pair of libraries I developed as parts of some recent iOS projects freely available for other iOS devs to use. I don't ...
19
votes
10answers
1k views

Is it ever OK to commit non-working code?

Is it good idea to require to commit only working code? This commit doesn't need to leave the repository in a working state as: ... we are in early design stages, the code is not yet stable. ...
3
votes
1answer
819 views

TFS Branching Advice

I am new to Branching and Merging but I have been tasked with making future development on an application possible while still allowing bug fixes to production. Usually I am the only developer on the ...
-1
votes
2answers
89 views

How to effectively share projects with other developers

I'm thinking of working with some other people on a c++ or java project. Usually for small projects, we collaborate mostly through emailing source code files back and forth, but on a larger scale, it ...
3
votes
2answers
80 views

Placing images into Git for a CRM

I have built this CMS that has the option to add entries to the database. Each entry that is created has about 5 to 10 new images showing the product for sale. Each image is about 150Kb in size. I ...
23
votes
10answers
3k views

When to commit code?

When working on a project, the code may be developed reasonably fast in a single day or bit by bit for a prolonged period of few weeks/months/years. As code commits are becoming to be considered as a ...
3
votes
1answer
231 views

Continuous integration and modifying existing UI automation tests

Our team is currently facing a situation where we are changing a feature that is in the product today. This feature has Selenium automation tests associated with it. We are performing a fairly major ...
4
votes
2answers
440 views

Git Staging: When to stage? What to do if modification occurs afterwards

I'm rather new to the broad world of Git. I have read the manual and have been practicing but I am confused about few aspects of it, which I couldn't figure out after searching for. I'm wondering: ...
1
vote
1answer
162 views

Using Git - better to do lot of incremental updates or one big daily update? [duplicate]

Ive just started working with Git (Github) in anticipation for an up coming project I'm project managing and designing and developing the front end of. One thing I couldn't work out is, is it ...
4
votes
3answers
333 views

Can we reduce confusion in line-based diff tools by annotating the code with some unique tokens?

Let's say I have procedure1() { --body of first procedure-- } Then I rename it into procedure2 and create a procedure1 above it: procedure1() { --body of second procedure-- } procedure2() ...
3
votes
4answers
856 views

Using Mercurial repository inside a Git one: Feasible? Sane?

I am thinking on creating a Mercurial repository under a Git repository. e.g. ..../git-repository/directory/hg-repo/ The 2 repositories Is it possible to manage (keeping your sanity)? How similiar ...
4
votes
2answers
272 views

Should I commit my generated parser to source control?

I'm using a parser generator to build a compiler. Should I commit the source files produced by the parser generator? I want to commit them to avoid a dependency on the parser generator during the ...
4
votes
4answers
221 views

Is there a name for the concept of a “cumulative checksum”?

Insofar as I understand it, tools like Git and Mercurial derive checksums from their data, and those checksums are used to derive other checksums used in aggregate, leading to a kind of accumulative ...
0
votes
1answer
336 views

Git Branch Model for iOS projects with one developer [duplicate]

I'm using git for an iOS project, and so far have the following branch model: feature_brach(usually multiple) -> development -> testing -> master Feature-branches are short-lived, just ...
6
votes
2answers
703 views

Git for a solo developer [duplicate]

I'm a developer working on a Wordpress project. I work on this alone and I want to improve the way I use Git but I don't know where to start. Currently, I'm using git to commit all of the work that ...
5
votes
1answer
253 views

How to set up a distributed version control that can commit to subversion

We have a trac server setup that works with the svn commits, so we can do things like "fixed #183" in the commit messages, and reference the changes involved. Right now I have eclipse with subclipse ...
6
votes
6answers
745 views

Should I be commiting code quickly and testing later? [duplicate]

I am a web and software developer involved in the creation of mobile apps. I am currently working on a project with a looming deadline. I am wondering if I should be committing code rapidly and large ...
28
votes
4answers
827 views

Zero-knowledge code hosting? [closed]

In light of recent revelations about widespread government monitoring of data stored by online service providers, zero-knowledge services are all the rage now. A zero-knowledge service is one where ...
5
votes
5answers
568 views

Why one would commit changes to version control every three minutes?

The frequency of commits depend on two factors: the developer himself: some developers tend to commit often, others may spend hours without committing, the current work: the same developer may have ...
-3
votes
1answer
237 views

Version Control for One Man Dev Team? [duplicate]

I recently began work at a small company as a lone software developer. Before I came no true documentation/version control/etc. was in place. The best they have is Microsoft Word documents and Excel ...
12
votes
4answers
3k views

Using git correctly in a small team

What would be the easiest way to use git correctly in a small team of about 5 developers, with one server running the live application?
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
1answer
187 views

How to manage pair- programming code check in user identification?

How do you identify users when a programming pair checks in code? I heard a complaint that, often a junior dev will be at the keyboard, using his/her account, but is not going to be the best person to ...
12
votes
4answers
2k views

Why is it preferred to write a commit message in present tense/imperative mood? [duplicate]

I often read/overhear that good commit messages should be written in present tense or to use imperative mood when describing the change eg. Fix xyz instead of Fixed xyz. What are the advantages of ...
6
votes
6answers
458 views

How big should a single commit be? [duplicate]

A discussion has come up at work and I want to get the opinion of other programmers. During my time in college, we only used SVN for sourcecontrol. Everybody commits to the same server and all ...
1
vote
1answer
168 views

Under what conditions should I rebase rather than merge?

Here is, roughly, our structure of work using git, for web development. We have a master branch, and individual or groups of work are done seperately in branches, then merged in. A ticket (or ...
0
votes
1answer
229 views

Version-control friendly, append-only file format: “binary” or “text”?

I'm designing an append-only ("journaled") file format, and I'd like it to be friendly towards being stored in VCS (git/Mercurial/...). On one hand, I'd like if after each change, only delta ...
4
votes
3answers
1k views

Maintaining SVN history for a file when merge is done from the dev branch to trunk?

In my org, we use SVN for version control So for each build (done periodically), we merge the code to trunk from the development branch (all the developers checks in to this branch). So when we want ...
17
votes
3answers
944 views

What is the value of using version control?

I'm new to version control (currently using SVN), but I don't understand how this helps developers. What does version control do that makes it useful in a development environment?
1
vote
2answers
156 views

Form, Fit and Function changes in relation to software

I am looking at configuration management and the idea of form, fit and function change can determine whether a change is minor or major. I wondered how this definition could be applied when doing ...
60
votes
5answers
4k views

Why does git use hashes instead of revision numbers?

I always wondered why git prefers hashes over revision numbers. Revision numbers are much clearer and easier to refer to (in my opinion): There is a difference between telling someone to take a look ...
-1
votes
4answers
204 views

Source control and compilation tool chain [closed]

I am a single developer working on a large system. I was recently informed that there may be an opportunity to recruit another developer or maybe two. I have incorporated source control into my ...
2
votes
2answers
146 views

Feature code + infrastructure code - how to structure the commits / JIRA issues?

Say that you work on a feature described by a single JIRA ticket and during the work, you: Create feature-specific code like the GUI or specific use-case behavior. Some of the code was generic so ...
5
votes
1answer
142 views

Can the version of Git vary between team members?

We are about 40 developers working on the same code base and we use Git for version control. My question is: can there be problems if, for example, some developers have a much older version of Git ...
-1
votes
2answers
5k views

Clearcase: Find out files checked in with the current snapshot view [closed]

If you have used clearcase before, then this question is for you. How do you determine all the files and their corresponding checkins?, given a snapshot view.
10
votes
6answers
373 views

Is there a version control system that can show changes to a specific method or function? [closed]

Sometimes it would be nice to be able to say something like: (git|svn|hg|etc) diff Foo.c:main (git|svn|hg|etc) log log Foo.c:main to see the changes made to a specific function within a source file ...
5
votes
2answers
217 views

Best practices for merging a new version of third party source into an old version you've made changes to

A project I work on uses source code that's been purchased from a third party. The source code is delivered to us in a zip file. We store this source code in version control (TFS 2010) and routinely ...
2
votes
1answer
207 views

git tagging comments - best practices

I've adopted a tagging system of x.x.x.x, and this works fine. However, you also need to leave a comment with your git tag. I've been using descriptions such as "fixes bug Y" or "feature X", but is ...
22
votes
10answers
3k views

How do you avoid working on the wrong branch?

Being careful is usually enough to prevent problems, but sometimes I need to double check the branch I'm working on (e.g. "hmm... I'm in the dev branch, right?") by checking the source control path of ...
53
votes
17answers
4k views

Alternatives to Professional Version Control

We're teaming up with some non programmers (writers) who need to contribute to one of our projects. Now they just don't like the idea of using Git (or anything for that matter) for version ...