Search Results

Search found 3166 results on 127 pages for 'git p4'.

Page 51/127 | < Previous Page | 47 48 49 50 51 52 53 54 55 56 57 58  | Next Page >

• What are the benefits of Mercurial or git over svn ?

  - by yves Baumes

  I've heard for instance that merging branches with git or mercurial is easier than with svn. Reading last Joel on software blog entry, I didn't get it exactly why. Could you provide a concrete exemple where merging with git/mercurial lead to less merge conflicts compared to svn please?

  Read the article

• What are the differences between GIT and SVN when it comes to merge conflicts solving.

  - by chalup

  I keep hearing that branching in git is so much easier than in SVN, because it's easier to merge the branch back to trunk/master. I've read some tutorials, but they only covered basic merge conflicts ("Alice changed line 8 of code.cpp and at the same time Bob changed line 8 of code.cpp...") and there are no differences between SVN and all other distributed source control systems. Can you give me the examples of changes in branch that would cause troubles in SVN repository, but would be handled gracefully by git?

  Read the article

• How do I pipe in FileMerge as a diff tool with git on OSX?

  - by doug

  I'm new to git, on OSX, using it via command line. I come from the world of Tortoise SVN and Beyond Compare on Windows. I want to be able to pipe in diffs to happen via FileMerge which I have installed already. I was able to do this with TextMate simply by using: git diff | mate But I'm not sure how to get that set up so I can use FileMerge instead?

  Read the article

• git: How do you add an external directory to the repository?

  - by Sly

  I want to add an external directory to an existing repository. External Dir: /home/some/directory Working Dir: /htdocs/.git If I attempt the following command from the /htdocs dir: git add /home/some/directory I get an error: fatal: '/home/some/directory' is outside repository

  Read the article

• What are the benefits of Mercurial or git over svn for branching/merging?

  - by yves Baumes

  I've heard for instance that merging branches with git or mercurial is easier than with svn. Reading last Joel on software blog entry, I didn't get it exactly why. Could you provide a concrete example where merging with git/mercurial lead to less merge conflicts compared to svn please?

  Read the article

• Why does git think my cs file is binary?

  - by Benjol

  I have just one cs file in my repository which git seems to think is binary (in git gui, it just says "binary files differ". Any ideas?

  Read the article

• How can I configure zsh to autocomplete branch names while using 'git checkout'?

  - by Shashank Pandit

  When I say 'git checkout ' I want zsh to autocomplete names of my git branches. Is that possible?

  Read the article

• Is there any git repository with official daily updated Gentoo portage?

  - by zed_0xff

  RSync is traditionally used to update Gentoo portage tree. But it's somewhat slow when dealing with a large number of files. So, I want to try to replace RSync with Git. I know that Funtoo have Git-based portage tree, but is there a Gentoo-specific official one?

  Read the article

• What does it mean when git says a file "needs update"?

  - by endtime

  I can't for the life of me find any decent explanation of the "[file]: needs update" message that git sometimes spits out from time to time. Even the official git FAQ has explaining this marked as a TODO. If someone could explain A) what it means; and B) how to fix it, I would be extremely grateful.

  Read the article

• Why does git branch -t fail with "Not tracking: ambiguous information"?

  - by che

  When I try to create a new branch tracking a remote branch, I get this: che@nok ~/prj/git-ipc $ git branch -t test main/some_remote_branch error: Not tracking: ambiguous information for ref refs/remotes/main/some_remote_branch The source seems to somehow search for branches to track and throws me out because it finds less more than one, but I don't exactly get what it's looking for since I already told it what to track on the command line. Can anybody tell me what's going on and how to fix it?

  Read the article

• How can I mark a single file as unresolved after a failed merge in git?

  - by forki23

  Hi, at the moment I'm merging a very large project and unfortunately I have lots of conflicts. After merging some files I realized that I made merge errors in a specific file and now it is marked as resolved. How can I unresolve it in git in order to merge it again. I tried git reset --hard -- myFile.txt but it doesn't work. Regards, Steffen

  Read the article

• How do I hook a git pull on the remote?

  - by Danny

  Is there a way to hook when a git pull happens on the remote (similar to a pre-receive or post-receive). Basically I'd like to be able to cause the remote to commit whatever it has when there is a pull. In my situation, whatever is live on the remote is an authoritative source which may get modified without a git commit. I want to make sure when I pull I'm always able to get the latest of whatever is live.

  Read the article

• Is it any git able text editor for MAC?

  - by Kukoda János

  Is it any extension for git for MAC users? I would like to use git integrated with TextWrangler or any text editor in my MAC.

  Read the article

• Best visual client for Git on Mac OS X?

  - by Chris Stewart

  I'm looking for a nice, Mac OS X-like, client for Git. As an example, I use Versions for Subversion and it's exactly what I'd like to purchase for Git access. Suggestions? Versions link

  Read the article

• Can I get git log to print the history in reverse order?

  - by Erik B

  I recently learned that I can get hg log to print the history in reverse order with: hg log -r : So of course I tried: git log -r : Well, it didn't work. So what is the command to do the same thing in git?

  Read the article

• How do I view 'git diff' output with visual diff program?

  - by padraigf

  When I type 'git diff', I want to view the output with my visual diff tool of choice (SourceGear diffmerge on Windows). How do I configure git to do this?

  Read the article

• How do I build git on Red Hat EL 3?

  - by Steve Hanov

  When you try to build git on Red Hat Enterprise Linux 3, you get an error: In file included from /usr/include/openssl/ssl.h:179, from git-compat-util.h:139, from builtin.h:4, from fast-import.c:147: /usr/include/openssl/kssl.h:72:18: krb5.h: No such file or directory

  Read the article

• Git/SVN for asp.net development instead of VSS?

  - by jrutter

  At work, we are using ASP.net 2.0 and VSS. VSS is a beast, we are continually having issues with people checking out files and there is no branching - makes it crazy. I know SVN/GIT is mainly used by open source developers, are there any downsides to ASP.NET developers using it? I have been pushing for SVN internally, but am thinking GIT might also be a great option. Our team is spread across 3 continents.

  Read the article

• is there a way to get git not to show the untracked files?

  - by chiggsy

  Is there a way to , when doing git commit to not display the untracked files in my $EDITOR? I know how to do so in the shell, using git status -u no, but I'd like do it in $EDITOR as well EDIT: I should have stated, I do not want to ignore these files forever, just not see them on certain occasions...

  Read the article

• On Windows, can we put different folders in 1 Git or Mercurial (hg) repository?

  - by Jian Lin

  On Windows, can we put different folders in 1 Git or Mercurial (hg) repository? Such as putting c:\ror c:\software projects\ruby c:\js test all in 1 Git or Mercurial repository called code ?

  Read the article

• How to generate changelog: git log since last Hudson build?

  - by takeshin

  I'm using Phing to do post build tasks in Hudson. I want to generate changelog containing all commits since last successful Hudson build. But looks like neither Hudson nor Git plugin for Hudson does not provide %last_build_time% variable. This would be satisfying solution, (but how to get the time?): git log --pretty="%s" --since="%last_build_time%" The only way I see for now is extracting it from the job xml file, but I do not know if it is possible with Phing. How do you generate your change logs?

  Read the article

• Is there a way to get to the git root directory in one command?

  - by wojo

  Mercurial has a way of getting to the root directory (that contains .hg) via hg root Is there something equivalent in git to get to the directory that contains the .git directory?

  Read the article

• Shared Hudson installation - how to enable access to git over ssh?

  - by tputkonen

  We are trying to set up a Hudson server and share it between different projects. Hudson authenticates users against our Windows domain AD, and the project based security matrix makes it easy to manage who can access which projects. Remaining issue is, that most of the projects use git over ssh. Is there a way to make shared Hudson access git so that each project could create their and manage their own jobs without compromising security?

  Read the article

• How do I move my git repo down level in the directory tree?

  - by edude05

  I'm currently writing an app in C# using using Visual Studio. As such, VS2010 created a Solution directory with my project directories inside. So my Hierarchy is like this: Solution .git project1 project2 What I'd like to do is make it like this: Solution Project 1 .git Project 2 As of right now the files in the solution are tracked, except for the project 2 (so stuff like project.sln for example). Is there a way I can do this without rewriting the history? Thanks in advance.

  Read the article

• Is it possible to remote count object and size of of git repository?

  - by runge

  Assume that somewhere in the web exists public git repository. I want to clone it but firstly i need to be sure what is size of it (how much objects & kbytes like in git count-objects) Is there a way to do it?

  Read the article

< Previous Page | 47 48 49 50 51 52 53 54 55 56 57 58  | Next Page >