version-control

Is using “feature branches” compatible with refactoring?

孤人 提交于 2019-12-31 10:32:42
问题 “ feature branches ” is when each feature is developed in its own branch and only merged into the main line when it has been tested and is ready to ship. This allows the product owner to choose the features that go into a given shipment and to “park” feature that are part written if more important work comes in (e.g. a customer phones up the MD to complain). “ refactoring ” is transforming the code to improve its design so as to reduce to cost of change. Without doing this continually you

Solution to adding a Git (TortoiseGit) toolbar to Visual Studio [closed]

走远了吗. 提交于 2019-12-31 09:45:15
问题 Closed. This question is off-topic. It is not currently accepting answers. Want to improve this question? Update the question so it's on-topic for Stack Overflow. Closed 4 years ago . Anyone know how to create a toolbar in Visual Studio 2010 to use with Git (TortoiseGit)? Thanks SurfRat 回答1: I wanted a Git toolbar in Visual Studio and I found no solution to this so I thought I would share this with you. I installed the Git Source Control Provider and got Git working (via TortoiseGit) with the

How to set up SVN credentials in Jenkins?

别来无恙 提交于 2019-12-31 08:34:09
问题 Is there a way to set up credentials that will be used by Jenkins when it performs SVN commit? I could't find a way to do so. If I run Jenkins server on my machine, which has SVN client installed and my credentials are cached, it seems to work fine, but if I try to run Jenkins server on another machine, then I get an error. ERROR: Failed to tag org.tmatesoft.svn.core.SVNCancelException: svn: No credential to try. Authentication failed 回答1: If you go to the job configuration window where

How to mark an issue as resolved from the commit log?

寵の児 提交于 2019-12-31 08:10:49
问题 I noted that in BitBucket when your commit log contains a number like #12 this number is linked to the bug number 12. I found this feature interesting, and I wonder if there is any keyword that would allow me to mark the issue as resolved from the commit log instead of going to the web interface each time. If BitBucket doesn't do it, could you point a system that does? 回答1: Bitbucket already supports marking issues on commit using the Issues service. The issues service scans commit messages

Are there any good graphical Git and Hg/Mercurial clients on Mac OS X?

混江龙づ霸主 提交于 2019-12-31 08:08:54
问题 I'm searching for compelling Git and Mercurial clients on Mac OS X. The most clients I've found so far were less compelling as I expected. Some of the clients are programmed even in Ruby or Tcl/Tk, which IMO aren't good OS X citizens in regard of integration in the OS. I have clients similar to Versions.app or Cornetstone in mind, which are Subversion-only clients. Perhaps somebody got an insider tip for me. 回答1: I just thought I'd mention that SourceTree is a Mac OS X client for both

Command to clear the Git Bash screen

与世无争的帅哥 提交于 2019-12-31 08:08:09
问题 Is there any command in Git, that clear the screen. for example in window command line after execute a lot of code, if you type cls, then it will clear all the previous code. so i want the same type of functionality in Git. so can anybody will tell me the command name. 回答1: Actually you are looking for a Unix user environment command clear or you can use the keyboard shortcut ctrl+l http://en.wikipedia.org/wiki/Clear_(Unix) To clear entire command history in Git Bash. history -c 回答2: try

Mercurial “no username supplied” error on Mac

只愿长相守 提交于 2019-12-31 07:38:10
问题 I've just installed Mercurial on my OSX Mountain Lion Max (10.8) and on my first commit I'm getting the error: abort: no username supplied (see "hg help config") I've seen a load of answers which suggest I need to create or copy a file form a certain location and paste it into another location and add my username and email to the document. If that is the right thing to do: Where is the file I need to copy (or what is the file called that I need to create) Where do I put that file Do I just

How to delete a branch in hg?

梦想的初衷 提交于 2019-12-31 03:03:07
问题 I am recently learning git, and found people can delete short branches, but in Hg, after merging the branch to default, how could I delete it? 回答1: You cannot. You can close the branch to hide it from the list of active branches, but you cannot completely delete it. This happens because in mercurial and in git the "branch" term means different things. In mercurial - it is a set of changesets. And in git - it is a pointer to a particular changeset. 来源: https://stackoverflow.com/questions

Don't diff merges with SVN

蹲街弑〆低调 提交于 2019-12-31 02:55:12
问题 I would like to get a diff of all the changes I did on a feature branch. Currently I use svn log --stop-on-copy | awk '/^r.+NAME/{print $1}' | xargs -l svn diff -c > code.diff Unfortunately this includes the revisions where trunk got merged into my branch and clutters the diff. Is there a way to get svn log to skipp merges or to get diff to ignore them? 回答1: As long as you merged all revisions from trunk into your branch you can diff the both trees of trunk (revision of last merge) and branch

What grails project files should not be added to version control? (Grails 1.3.x)

核能气质少年 提交于 2019-12-31 01:25:51
问题 (This question has been asked before, but a while back: Suggestions for Grails .gitignore; it was answered for grails 1.0.x) What files in a Grails 1.3.x project should not be included in version control? 回答1: See http://grails.org/Checking+Projects+into+SVN - it has a short list of ignores. I would include .settings/ but I tend to keep .classpath and .project in source control because they change with the project. Then again, perhaps it's better simply to run grails integrate-with --eclipse