Search Results

Search found 5413 results on 217 pages for 'git pull'.

Page 42/217 | < Previous Page | 38 39 40 41 42 43 44 45 46 47 48 49  | Next Page >

  • Git log: fatal object [sha1] is corrupted

    - by Keyo
    Is there any way I can repair my repository with commit history in tact. # git log fatal: object 01aeb2bf2e93b238f0e0422816b3e55518321ae7 is corrupted From reading the link below it looks like I'll have zap it and start over. http://www.miek.nl/s/7e76eadefe/

    Read the article

  • Git Reverting the Repository to Previous State

    - by azamsharp
    I have a .gitignore file in my project directory and I placed the following entry in the file to not to commit the files in the following folder: EStudyMongoDb.Integration.Test\ For some reason Git pushed the files to repository anyway! Anyway! now I want to remove those files that have been pushed to the repository but I don't want to loose my local changes to the files inside the folder. How can I do that?

    Read the article

  • Accidentally committed dev database to Git

    - by Euwyn
    I accidentally committed my development.sqlite3 file to Git, and it seems to be slowing down my commits. I know about .gitignore, but does this take the file out of my repository once I've done so? My concern is is with reducing the commit and push times.

    Read the article

  • Git - how do I view the change history of a file

    - by Richard
    How can I view the change history of an individual file, complete with what has changed ? I have got as far as : git log -- filename which shows me the commit history of the file, but how do I get at the content of each of the changes ? Thanks - I'm trying to make the transition from MS SourceSafe and that used to be a simple right click / show history.

    Read the article

  • how to view file history in GIT?

    - by mrblah
    With subversion I could use tortieseSVN to view the history/log of a file. How can I do this with git? Just looking for history record for a particular file, and then the ability to compare the different versions.

    Read the article

  • Git versus Mercurial for .NET developers?

    - by jwanagel
    I've been wondering what is the better DVCS for .NET developers? From reading various information it has sounded like Mercurial works better on Windows, but other information claims that Git has caught up and surpassed Mercurial in offering quality Windows and Visual Studio tools. Does anyone have good recent information or experience with trying both in a .NET development environment?

    Read the article

  • When to delete a branch from Git?

    - by lupefiasco
    I'm relatively new to Git, and want to get advice on best practices for deleting branches. After I've created and merged a branch back into master, should I leave it hanging around for historical purposes, or should I delete it as soon as it's no longer needed for housekeeping purposes?

    Read the article

  • Aborting a merge in git

    - by user18666
    I've done 'git pull', and received a merge conflict. I know that the other version of the file is good, and that mine is bad (all my changes should be abandoned). How do I do this? unmerged: _widget.html.erb You are in the middle of a conflicted merge.

    Read the article

  • git clone with ssh issue

    - by george
    Hi, I have generated a public key, private key pair. I've set the public key to the site. How to use the console in windows to clone a git repository? What do I do with the private key? I keep getting: the remote end hung up unexp. Thanks

    Read the article

  • Git undo last commit.

    - by Justin
    I merged the wrong way between two branches. I then ran the following: git reset --hard HEAD^ I am now back at the previous commit (which is where I want to be). Was that the correct thing to do? The bad commit is still in the repository, is that okay or should I do something else to remove it from the repository? I have not pushed or committed anything else yet.

    Read the article

  • Windows GUIs for git (Updated)

    - by Benjol
    I am aware of this question, but it is a bit old now, and some of the answers seem outdated. Question: please write one answer per GUI you have used, including pros and cons (for example, as far as I can tell, with git gui, you can't manage the stash).

    Read the article

  • Changing git origin to point to an existing repository

    - by int3
    I'd like to make my local repo point to a different fork of the same project. Will this work? Do a merge with the 'target origin' Change the origin repo in my config file to the 'target origin' Also, if my local repo is not entirely identical to the new origin (say, I've resolved some merge conflicts in my favor), will these changes be pushed to the new origin when I do a git push, or will only commits made after the change of origin get pushed?

    Read the article

  • git rebase, keeping track of 'local' and 'remote'

    - by Benjol
    When doing a git rebase, I often have difficulty working out what is happening with the 'local' and 'remote' when resolving conflicts. I sometimes have the impression that they swap sides from one commit to the next. This is probably (definitely) because I still haven't properly understood. When rebasing, who is 'local' and who is 'remote'? (I use P4Merge for resolving conflicts)

    Read the article

  • Code Promotion with Git

    - by draxter
    Hi, I'm trying to figure how can I use git for multiple environments (dev-test-prod) with code promotion. I read a bit about branching but didn't understand much how can this solve my problem since I must have the ability to run all of the environments concurrently and separately from each other. Will be very thankful for some kind of how-to.

    Read the article

  • Git as a backup and Version Control System.

    - by gitnoob
    Hi. I want to use Git to backup my home drive, but I also want to use it as a version control system for projects that will be stored in my home drive. How would I go about doing that? Do I .gitignore all the projects root folders and make new repositories for them?

    Read the article

  • Git repository issues

    - by sreeni
    Hi, I am working on origin:abc remote repository . I want to update the origin:def repository in the remote repository in git. Can some please give me command for this?

    Read the article

  • Advice Needed: Developers blocked by waiting on code to merge from another branch using GitFlow

    - by fogwolf
    Our team just made the switch from FogBugz & Kiln/Mercurial to Jira & Stash/Git. We are using the Git Flow model for branching, adding subtask branches off of feature branches (relating to Jira subtasks of Jira features). We are using Stash to assign a reviewer when we create a pull request to merge back into the parent branch (usually develop but for subtasks back into the feature branch). The problem we're finding is that even with the best planning and breakdown of feature cases, when multiple developers are working together on the same feature, say on the front-end and back-end, if they are working on interdependent code that is in separate branches one developer ends up blocking the other. We've tried pulling between each others' branches as we develop. We've also tried creating local integration branches each developer can pull from multiple branches to test the integration as they develop. Finally, and this seems to work possibly the best for us so far, though with a bit more overhead, we have tried creating an integration branch off of the feature branch right off the bat. When a subtask branch (off of the feature branch) is ready for a pull request and code review, we also manually merge those change sets into this feature integration branch. Then all interested developers are able to pull from that integration branch into other dependent subtask branches. This prevents anyone from waiting for any branch they are dependent upon to pass code review. I know this isn't necessarily a Git issue - it has to do with working on interdependent code in multiple branches, mixed with our own work process and culture. If we didn't have the strict code-review policy for develop (true integration branch) then developer 1 could merge to develop for developer 2 to pull from. Another complication is that we are also required to do some preliminary testing as part of the code review process before handing the feature off to QA.This means that even if front-end developer 1 is pulling directly from back-end developer 2's branch as they go, if back-end developer 2 finishes and his/her pull request is sitting in code review for a week, then front-end developer 2 technically can't create his pull request/code review because his/her code reviewer can't test because back-end developer 2's code hasn't been merged into develop yet. Bottom line is we're finding ourselves in a much more serial rather than parallel approach in these instance, depending on which route we go, and would like to find a process to use to avoid this. Last thing I'll mention is we realize by sharing code across branches that haven't been code reviewed and finalized yet we are in essence using the beta code of others. To a certain extent I don't think we can avoid that and are willing to accept that to a degree. Anyway, any ideas, input, etc... greatly appreciated. Thanks!

    Read the article

  • Is there a way to easily convert a series of tarballs of a source tree into a git repository?

    - by Hotei
    I'm new to git and I have a moderately large number of weekly tarballs from a long running project. Each tarball has on average a few hundred files in it. I'm looking for a git strategy that will allow me to add the expanded contents of each tarball to a new git repository, starting from version 1.001 and going through version 1.650. As of this stage of the project 99.5% of tarball(n) is just a copy of version(n-1) - in other words, a perfect candidate for git. The desired end result is to have only the master branch remaining at the end of the process. I think I know git well enough to do this "by hand". As I understand it there is no possibility of a merge conflict since there will be no opportunity to change the master before the next version is added and committed. A shell script is my first guess, but I'm not sure how well bash will like it when git checkout branch_n gets processed while bash is executing in branch_n-1. For the purposes of this project the host environment is Ubuntu 10.4, resources available are 8 Gig RAM, 500 Gig Disk space free and 4 CPU processor at 3.ghz . I don't need someone else to solve the problem but I could use a nudge in the right direction as to how a git expert would approach it. Any advice from someone who's "been there done that" would be appreciated. Hotei PS: I have looked at site's suggested "related questions" and found nothing relevant.

    Read the article

  • git pull-push giving error

    - by ntidote
    Hi i cloned a local repository on another server http://localipaddress/git/project . It created an empty repository. When i tried to pull from the repository, it gave me an error Your configuration specifies to merge with the ref 'master' from the remote but no such ref was detected. On push i get the following message error:Cannot access url "http://localipaddress/git/project" , return code 22 . Fatal git-http-push failed What could have been wrong.

    Read the article

< Previous Page | 38 39 40 41 42 43 44 45 46 47 48 49  | Next Page >