Search Results

Search found 5564 results on 223 pages for 'git svn'.

Page 68/223 | < Previous Page | 64 65 66 67 68 69 70 71 72 73 74 75  | Next Page >

  • What's the best visual merge tool for Git?

    - by andy
    Title says it. What's the best tool for viewing and editing a merge in Git? I'd like to get a 3-way merge view, with "mine", "theirs" and "output" in separate panels. Also, instructions for invoking said tool would be great. (I still haven't figure out how to start kdiff3 in such a way that it doesn't give me an error) edit: My OS is Ubuntu.

    Read the article

  • eclipse 3.5 filter .git folder

    - by jpfuentes2
    I'm using eclipse 3.5.2 and cannot seem to use "filter resources" to filter out .git folders in any of my projects for any of my perspectives: javascript, ruby, and php. I've tried adding the filter to plugin.xml as suggested on this blog but it is for eclipse 3.4 and doesn't seem to work. Any suggestions?

    Read the article

  • Using a visual tool to view changes on git repository

    - by Phuong Nguy?n
    I'm coming to an existing project in which people used git to track everything from scratch. I want to have a tool to view the differences between several commits. gitk does a good job, but talking about human readability, it's does not facilitate me much. Is there a better solution? I'm looking for a set of tools that allow me to easily compare branches (some how like winmerge - Display two version in parallel and highlight the changes), and running on Mac.

    Read the article

  • git create branch with untracked files

    - by Surya
    I've a master branch with a .gitignore file with directory X listed in it. (X is not being tracked). When I try to add a branch tracking a remote using the command git checkout -b mybranch origin/mybranch The remote branch is tracking X directory, and hence this checkout fails with the error Untracked working tree file 'X' would be overwritten by merge. what is the way out ? Surya

    Read the article

  • update version each time git push is done ?

    - by Adam Ramadhan
    how do we do like changing version ( each +1 ) using git on each push? example i have a 2 php file libs/lib1.php libs/lib2.php on each header usually there is some information like /** * LIB1.PHP * this libs does something like this * and that this is a doc for you * @version 145 * @todo something todo * @author DAMS */ /** * LIB2.PHP * this libs does something like this * and that this is a doc for you * @version 445 * @todo something todo * @author DAMS */ can we search and add +1 do version every time we push?

    Read the article

  • Production and Test Server using Git

    - by Mike Silvis
    I am running a PHP - MySQL website, and have set up a remote repository on my own server using Git. I now want a way to be able to have a production and a test server, and some how be able to push my changes from dev to production easily. and seamlessly.

    Read the article

  • Using GitNub with Git

    - by Mike Silvis
    I'm trying to use GitNub, a graphical GUI for Git, and for some reason upon installing the software running the command 'nub' in the terminal doesn't seem to launch anything for me. I am running Mac OS X version 10.6.3 Gitnub version 0.9.1 I have copied the GitNub.app to my applications folder and created a new folder under /usr/local/ called "bin" to put the 'nub' executable inside of it.

    Read the article

  • git: ignore everything except subdirectory

    - by Michael Goerz
    I want to ignore all files in my repository except those that occur in the 'bin' subdirectory. I tried adding the following to my .gitignore * !bin/* This does not have the desired effect, however: I created a new file inside of bin/, but doing 'git status' still "shows nothing to commit (working directory clean)" Any suggestions? Thanks, Michael

    Read the article

  • Good Git repository viewer for Mac

    - by Sergio Acosta
    Can anyone recommend a good repository viewer for Git, similar to gitk, that works on Mac OS X Leopard? (I'm not saying gitk doesn't work) Of course I would like a native Mac application, but as I haven't found any, what are the best options to gitk? I know about gitview, but I'm looking forward to evaluate as many alternatives as possible. http://sourceforge.net/projects/gitview

    Read the article

  • What are the destructive commands in git?

    - by Riccardo Galli
    I read that Git mainly add informations about the repository's history, trying to remember every change made, but that there are also commands that make irreversible changes. What are the commands that I should really pay attention to and avoid to use wrongly because there is not turning back?

    Read the article

  • git: changelog day by day

    - by takeshin
    How to generate changelog of commits groupped by date, in format: [date today] - commit message1 - commit message2 - commit message3 ... [date day+3] - commit message1 - commit message2 - commit message3 ... (skip this day if no commits) [date day+1] - commit message1 - commit message2 - commit message3 ... [date since] - commit message1 - commit message2 - commit message3 Any git log command, or smart bash script?

    Read the article

  • Describe your workflow of using version control (VCS or DVCS)

    - by edwin.nathaniel
    I'd like to learn other people workflow when using either SVN or GIT. Please describe your strategy to handle the following tasks: Implement a feature Fixing bugs (during development and deployed app) Code Review Refactoring code (post code-review) Incorporate patches Releasing the newer version of your app (desktop, web, mobile, would you treat them differently?) Feel free to organize your answer not grouped by the tasks but grouped by whatever you think is relevant but please organize it by VCS/DVCS (please don't mix them). Thank you.

    Read the article

  • 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

< Previous Page | 64 65 66 67 68 69 70 71 72 73 74 75  | Next Page >