Tag Info

Hot answers tagged

42

Is there a social or technical solution to this? I suppose, but this isn't a problem. Your manager should know what you guys are doing. They should make sure that you're not doing a bunch of work that provides no value, or why non-ticket work was prioritized. There is no harm in this. In an ideal world, it will provide benefit, because your manager can ...


13

If the stylistic fix is part of the ticket you are working on and it is related then there is nothing wrong with checking it in separately with the same ticket number you were working on for better identification. If you are just discovering changes that need to be made and they are not related to the ticket that you are currently working on then I would ...


5

The good schedule is to merge only stable code (or "likely to be stable" code). If you merge half-way just to begin tests, and you know that some of the features you're currently coding are not finished, you surely will get some testing feedback about these features. The question you have to ask is "Am I confident with the completeness of what I already ...


4

If, as you write, you directly edit files on the server over SFTP, your only option (as far as I can see) is to install git on the server, login via SSH and do all git operations locally. You'd have to create a repository on the server, add all your files and then commit regularly. In that case your working directory would be the directory where all the JS ...


3

Although I agree with most of Randall Cook's answer, I would like to add some additional things. Your requirements should be under configuration management and be controlled in some way. That is, you should be able to associate a given set of requirements (perhaps captured in a SRS document or a collection of user stories or a database or some other format) ...


3

Yes and no. Version control is about just that: control of revisions of assets, be they source code text files, images, or even documentation. While software engineers usually put source code and graphical assets (once they receive them) under version control, graphical assets and standards documents are often prepared by non-engineers. In my experience, ...


2

There's no need to start a new repository, just start branching. Give leaders permission to merge onto trunk, everyone else must create a branch and commit their work there. the only extra complication is having to create a branch (per ticket, recommended) and switch their working copy to the branch rather than trunk. You can get rid of the exclusive ...


2

If you look at the version control diff, it's nearly impossible to see what was added as whole table has been rewritten Then don't look at the version control diff. For instance WinMerge, which is free & runs on both Windows & Linux has an option " Line differences with Whitespace: Ignoring all". Couldn't you use that? It won't show those ...


2

One possible kludge which would allow you to keep you change history but align your code correctly would be to comment out the entire existing table. And add a new correctly aligned table after it. This would/should be recorded as just two changes in the source code. After the new table been saved in the repository you can delete the commented out section ...


1

SVN/GIT or any control version should work. Except for very specific application, web application a rarely live ( in the sense Physically loaded in memory) and i assume your application doesnt rewrite itself ( else you have the risk of rewriting the push you just made). Then if you push your file the next call on the webserver/php will load the new code ...


1

This bugs me too (no pun intended :). Most helpful check-ins contain comments that are unique, and specific to not only what changed, but why. I sometimes end up putting paragraph comments. I occasionally get into situations where a UI requirement bounces back and forth once development has started, requiring me to essentially bounce the code also (yeah, ...



Only top voted, non community-wiki answers of a minimum length are eligible