Search Results

Search found 6882 results on 276 pages for 'git repository'.

Page 79/276 | < Previous Page | 75 76 77 78 79 80 81 82 83 84 85 86  | Next Page >

  • How can I merge 2 branches in my local repository

    - by michael
    Hi, I have 2 branches in my hg repository: 1. default 2. new-feature I tried following this: http://mercurial.selenic.com/wiki/NamedBranches, I switch back to default by 'hg update -c default' but how can I merge my commits in 'new-feature' to 'default'. I did "hg pull new-feature", it said "repository new-feature not found"! Thank you.

    Read the article

  • Java Packages in Seperate repository than others

    - by sethxian
    I was wondering if it's possible to have a java package setup using a different subversion repository than the rest. Ideally, I would probably go with a different library project, but in the case of BlackBerry, the 3rd party library linking does not work well, so I would like to just separate my UI package into a different repository than the rest so that I can control the UI better for different OS versions, but leave all the other packages the same. Is this possible?

    Read the article

  • Repository Pattern: SaveOrUpdate() in Entity Framework and L2S

    - by JMSA
    These web articles uses separate Save() and Update() methods in the repository pattern. I am using repository pattern. How can I write a SaveOrUpdate() method in Entity Framework with the help of ObjectContext and in Linq-To-SQL with the help of DataContext? That is, how can I write a single method that shall do both save and update job?

    Read the article

  • SVN repository browser issue

    - by williang
    Hi, I use TortoiseSVN on WindowsXP and ran into an issue inside repository browser today. Basically, I can browser/checkout fine at application level "https://domain/svn/app1". However, When I try to browse at the root level of the repository "https://domain/svn/", the following error msg displays: OPTIONS of 'https://domain/svn': 200 OK I try to access https://domain/svn in a web browser, I can see all the applications there. Thanks

    Read the article

  • Get all revisions from CVS repository

    - by Heinz
    Hi, I have set the correct CVS Root, within this root I have a repository which contains a number of files. In particular, I am interested in the revisions of one of the files, lets call it test.tex. Now I would like to get ALL different versions of this file, from the repository. Is there somehow a command that I could use to do that? Or do I need to extract them one after the other? Many thanks!

    Read the article

  • Organizing github repository for java 6 and 7

    - by Edmon
    I am wanting to create a gihub repository that offers benchmarking code that works for concurrent features available only in JDK 1.7 (Fork/Join) as well as for older ones found in JDK 1.6. Offering both options is important for what I need. Does anyone have a recommendation how should I structure the repository. I was planning on having a repo called and under it: jdk17 build src mycode ... jdk16 build src mycode Please suggest any alternatives, possibly use of Maven or other more practical approaches, if any.

    Read the article

  • gitosis did not generate projects.list automatically, gitweb can't work.

    - by Readon Shaw
    I setup a gitosis managed git server. git clone is ok. but when I set gitweb via gitweb.conf as below: $projectroot = "/srv/gitosis/repositories"; $git_temp = "/tmp"; $home_text = "indextext.html"; $projects_list = "/srv/gitosis/gitosis/projects.list"; $stylesheet = "/gitweb/gitweb.css"; $logo = "/gitweb/git-logo.png"; $favicon = "/gitweb/git-favicon.png"; Btw, the commet was deleted because of the special symbol # is using as bold prefix. "403 Forbidden - No projects found" is reported when I access gitweb through "http://localhost/cgi-bin/gitweb.cgi" I checked the projects.list file it is empty, is that the reason why gitweb access failed? what would be the correct content? can i add it manually?

    Read the article

  • How to permanently remove xcuserdata under the project.xcworkspace and resolve uncommitted changes

    - by JeffB6688
    I am struggling with a problem with a merge conflict (see Cannot Merge due to conflict with UserInterfaceState.xcuserstate). Based on feedback, I needed to remove the UserInterfaceState.xcuserstate using git rm. After considerable experimentation, I was able to remove the file with "git rm -rf project.xcworkspace/xcuserdata". So while I was on the branch I was working on, it almost immediately came back as a file that needed to be committed. So I did the git rm on the file again and just switched back to the master. Then I performed a git rm on the file again. The operation again removed the file. But I am still stuck. If I try to merge the branch into the master branch, it again says that I have uncommitted changes. So I go to commit the change. But this time, it shows UserInterfaceState.xcuserstate as the file to commit, but the box is unchecked and it can't be checked. So I can't move forward. Is there a way to use 'git rm' to permanently remove xcuserdata under the project.xcworkspace? Help!! Any ideas?

    Read the article

  • Private VCS hosts for school projects?

    - by Ibrahim
    I want to use version control for a partner project for school, but these days it seems like there are no private, free VCS hosts that I could use. I would prefer to use git if possible, but I wouldn't mind SVN. Alternatively, if there aren't any, shouldn't there be some way for me to use git without a central repository? I don't know enough about git, but I assume that is the point of a DVCS, no? I've considered scp'ing a clone of the repository to my school unix account and then giving my partner access to that, but it seems like it would be a bit of a pain. What are your thoughts/suggestions? Edit: I do know of one site called xp-dev, but I'm not sure how much I trust it. But I could use that and use git-svn on my side, since my partner has actually only ever used svn. But still wondering if there are any alternatives.

    Read the article

  • Shell Script Sequencing with Rake

    - by Haseeb Khan
    Hi All, I am working on a rake utility and want to implement something mentioned below: There are some shell commands in a sequence in my Rake file. What I want is that the sequence should wait for the previous command to finish processing before it moves to the next one. sh "git commit -m \"#{args.commit_message}\"" do |ok, res| # Do some processing end sh "git push heroku master" So, in the above example what I want is that sh "git push heroku master" shouldn't be executed until the processing in the sh "git commit -m \"#{args.commit_message}\"" do |ok, res| # Do some processing end is completed. Also another nice to have would be that if I can store the output of the shell command in a Ruby variable so it can be used in further manipulation if required. Looking forward to a reply from the fellow community member shortly. Thanks in advance.

    Read the article

  • How do I get Eclipse CDT to ignore files

    - by brianegge
    I have a C++ project in Eclipse. The project uses Perforce and Eclipse has the Perforce plugin installed. Everything was fine, until I decided to create a git repo in my project. I created the git repo to snapshot some changes which I wasn't ready to commit. Everything was fine until I refreshed my files in Eclipse. Two problems have occurred: Eclipse found my .git folder, and indexed all of the files inside of it. Eclipse also decided to add all the git file to my pending change list. If I create a new file within Eclipse, I'd like it to add it to Perforce, but if it happens to find a file, I don't want it to do anything with it. I'd also like to give Eclipse a list of file types to always ignore, just like I do with my .hgignore file.

    Read the article

  • Confusing .gitignore syntax

    - by tmslnz
    I was reading http://www.kernel.org/pub/software/scm/git/docs/gitignore.html and the 6 points used to explain the ignore patterns seem to be describing a custom variant of a glob search syntax. I am more familiar with Mercurial, which allows to explicitly ignore via glob or regex patterns, no questions asked. Is there anything similar functionality in Git? Can anyone point me to some more exhaustive reference than the Git man page? Best, t

    Read the article

  • GitHub solution for personal repo

    - by Luke Maurer
    So I've got my private SVN repo on my home server, and it has maybe 30 different modules thrown together in it, ranging from abortive throw-away larks to a few endeavors that might actually go somewhere someday. But a recent filesystem failure (BTW, never ever EVER use XFS without a battery-backed hardware RAID) has me spooked and thinking of using a DVCS for all that. I've also just had quite the swig of the Git koolaid, and I've been working with GitHub of late, so that's where I'm looking right now. Of course, it would be silly to shell out major cash for a separate private Git repo for every little project, and I don't want to have to be selective about what I throw up there (I love all my children :-D ), so I'll have to be somewhat creative about this. I can happily use SSH to my home box to use Git the way I've been using SVN, and I'm thinking from there I could amalgamate everything into, say, a big project with 30 submodules, which I then push to GitHub. What'd be a sane way to set this up? Does using submodules sound feasible? How do I sync it all to my private GitHub repo? Cron job? Git hook? I'd love to hear it if anyone's done something similar. I'm not really married to Git or GitHub, so a sufficiently compelling feature of another solution might sway me. But if your answer does involve a different system (especially a different VCS), be advised it'll be a tougher sell :-)

    Read the article

  • Stage untracked files for commit without staging tracked file changes

    - by Blair Holloway
    Oftentimes, when using git, I find myself in this situation: I have changes to several files, but I only want to commit parts of them. I have added several untracked files, which I want to track and commit. Solving the first part is easy; I run: git add -p Then, I choose which hunks to stage, and which hunks remain in my working tree, but unstaged. However, git's patch mode skips over untracked files. What I would like to do is something like: git add --untracked But no such option appears to exist. If I have, say, six untracked files, I could stage them using add in interactive mode and the add untracked option, like so: git add -i a<CR> 1<CR> 2<CR> 3<CR> 4<CR> 5<CR> 6<CR> <CR> q<CR> I feel like there is, or should be, a quicker way of doing this, though. What am I missing?

    Read the article

  • GitHub solution for personal repo

    - by Luke Maurer
    So I've got my private SVN repo on my home server, and it has maybe 30 different modules thrown together in it, ranging from abortive throw-away larks to a few endeavors that might actually go somewhere someday. But a recent filesystem failure (BTW, never ever EVER use XFS without a battery-backed hardware RAID) has me spooked and thinking of using a DVCS for all that. I've also just had quite the swig of the Git koolaid, and I've been working with GitHub of late, so that's where I'm looking right now. Of course, it would be silly to shell out major cash for a separate private Git repo for every little project, and I don't want to have to be selective about what I throw up there (I love all my children :-D ), so I'll have to be somewhat creative about this. I can happily use SSH to my home box to use Git the way I've been using SVN, and I'm thinking from there I could amalgamate everything into, say, a big project with 30 submodules, which I then push to GitHub. What'd be a sane way to set this up? Does using submodules sound feasible? How do I sync it all to my private GitHub repo? Cron job? Git hook? I'd love to hear it if anyone's done something similar. I'm not really married to Git or GitHub, so a sufficiently compelling feature of another solution might sway me. But if your answer does involve a different system (especially a different VCS), be advised it'll be a tougher sell :-)

    Read the article

  • SSH is looking in the wrong place for the public/private key pair on Windows

    - by Michael Morisy
    I'm trying to configure GIT on my Windows XP machine, but SSH keeps creating and looking for the public/private key pair in non-sensical places, e.g. /.ssh/id_rsa Is there a configuration file in the GIT Installation for Windows where I can switch this to my home directory, or another user defined place? By default, it offers to create new key pairs at //.ssh/id_rsa but that gives me the error "Could not create directory '//.ssh'." And when I'm able to find a directory I can create it in, GIT won't look there.

    Read the article

  • How can I move all my modification to a branch

    - by michael
    Hi, I create a working repository in HG. And I have modified some files. How can i move my all my modification to a branch (a branch that I have not created)? (kind of 'git stash' and the move the stash away change to a branch. Actually, I am not sure how I can do that in git either. If you know, I appreciate if you can tell me in git as well) Thank you.

    Read the article

  • .gitignore not working for me

    - by John Grey
    Hi, I'm trying to create a new git repository from existing folder. I've created a .gitignore file in the root of the folder. But if I say 'git add *' 'git commit' 'git push' files that should be ignored still get commited to the remote repository. I'm on Windows. Also I've bought a license for SmartGIT. It also seems to ignore .gitignore. I have to manually select which new files to commit. What am I doing wrong?

    Read the article

  • Cannot delete a remote branch created unintentionally

    - by Himel
    $ git branch -a * SocialAct master remotes/origin/HEAD -> origin/master remotes/origin/SocialAct remotes/origin/social I want to delete the remote branch "remotes/origin/social", and applied folloing command: $ git branch -d -r origin/social Deleted remote branch origin/social (was 26f6f61). But I have no idea how to bring these changes remotely so that the branches are deleted from origin and everyone can see the changes. I tried git push but that does not work Any help.

    Read the article

  • How can I merge 2 commits into 1

    - by michael
    Hi, I am trying to merge 2 commits into 1. So I follow this: http://www.gitready.com/advanced/2009/02/10/squashing-commits-with-rebase.html I did $ git rebase --interactive HEAD~2 It opens an editor I change 'pick' to 'squash' Save the editor But i get 'Cannot 'squash' without a previous commit' so what can I do to recover? When I do ' git rebase --interactive HEAD~2 Interactive rebase already started' When I do '$ git rebase --continue Cannot 'squash' without a previous commit' Thank you.

    Read the article

< Previous Page | 75 76 77 78 79 80 81 82 83 84 85 86  | Next Page >