Search Results

Search found 4819 results on 193 pages for 'git merge'.

Page 23/193 | < Previous Page | 19 20 21 22 23 24 25 26 27 28 29 30  | Next Page >

• how do i identify files/directories that were added or removed in a git commit?

  - by pocketfullofcheese

  I need to write a script that incrementally keeps track of files and directories added and removed from a git repo. I have tried to use: git log -n1 --pretty="format:" --name-only But that only tells me which files were committed. It does not specify if it was added or removed. Any ideas?

  Read the article

• How can I prevent git push if local modifications are detected (including untracked files)?

  - by Clint Modien

  Sometimes someone on our team does a git push and breaks the build because his local build works but he has forgotten to commit all his local modifications and untracked files to git before he pushes. I'd like to prevent this... I poured over the docs for an hour or so today and couldn't find anything built in. Does anyone have any solutions?

  Read the article

• As of right now, on Windows 7, does Mercurial start up a server much simpler than Git?

  - by Jian Lin

  On Windows 7, from reading hginit.com, it seems like it is very easy to set up a Mercurial server? mkdir repo cd repo hg init hg serve and that's it? Now http://localhost:8000 is the server. It seems that it is quite a bit harder to set a Git server up, either for Cygwin and mysysGit? Git for sure will make it simpler, maybe just not at this…

  Read the article

• How can I push to a git-svn repo?

  - by Arthur Ulfeldt

  I cloned an svn repo with git svn clone ... and now I want to push changes to it. after that I will use this repo to rebase everything and commit back to svn. The problem that pushing to a non-bare repo seems to not be a good idea, and git svn seems unhappy about working with a bare one?

  Read the article

• git-svn: what's the equivalent to `svn switch --relocate`?

  - by kch

  An svn repository I'm mirroring through git-svn has changed URL. In vanilla svn you'd just do svn switch --relocate old_url_base new_url_base. How can I do this using git-svn? Simply changing the svn url in the config file fails.

  Read the article

• Migrating from Subversion to Git how can I find a commit given a revision number?

  - by Patrick Allaert

  Migrating from Subversion to Git using svn2git (which internally uses git-svn) I'd like to know how I can find a specific revision commit. It is quite common to have issues tracker to have comments like: "Fixed in r12345". Given this, I'd like to be able, for example, to extract the diff corresponding to r12345. Thanks in advance. Regards

  Read the article

• git push merge error, but git pull is already up-to-date. Tried reclone, same problem.

  - by Jasie

  I do: git commit . git push error: Entry 'file.php' not uptodate. Cannot merge. Then I do git pull Already up-to-date. What do I do? I just want to get the latest version from the remote copy, and overwrite anything on my local copy. Edit: I tried everything. I deleted my local repo, and git clone…

  Read the article

• git clone fails with "index-pack" failed?

  - by gct

  So I created a remote repo that's not bare (because I need redmine to be able to read it), and it's set to be shared with the group (so git init --shared=group). I was able to push to the remote repo and now I'm trying to clone it. If I clone it over the net I get this: remote: Counting objects: 4648, done. remote:…

  Read the article

• git clone fails with "index-pack" failed?

  - by gct

  So I created a remote repo that's not bare (because I need redmine to be able to read it), and it's set to be shared with the group (so git init --shared=group). I was able to push to the remote repo and now I'm trying to clone it. If I clone it over the net I get this: remote: Counting objects: 4648, done. remote:…

  Read the article

• Deploying a Rails app on an Ubuntu server using Git

  - by NudeCanalTroll

  I'm completely new to Linux, but today I find myself setting up a server (Ubuntu 10.04 LTS lucid) from scratch to host a Rails application. Anyway, I managed to get a Rails app up and running on the server itself, but I had to scrap that because I want to use Git. So I setup a git repository on the server, then pushed all the…

  Read the article

• git merge should ignore one directory

  - by dorelal

  I have tons of data in directory called reports. While doing git merge with another branch I am getting lots of conflicts for files under reports directory. I would like git merge to ignore files under reports. In another words I would like all the data from reports from master and not from lab branch. Is that possible? …

  Read the article

• In git, what is the difference between merge --squash and rebase?

  - by GiH

  I'm new to git and I'm trying to understand the difference between a squash and a rebase. As I understand it you perform a squash when doing a rebase.

  Read the article

• Merge several mp4 video using ffmpeg and php [on hold]

  - by rihab

  I would like to merge several videos using ffmpeg and php. I want to retrieve the names of the videos dynamically but I can't merge all the videos together I only get i-1 merged videos This is the code I use: <?php $checkBox = $_POST['language']; $output=rand(); function conv($checkBox){ $tab=array(); for($i=0;…

  Read the article

• Clone submodule into directory

  - by andypaxo

  I'm having an issue with creating a submodule in my project. If I create the submodule directly in the repository root, everything works fine. If the submodule is any deeper, the repository does not get cloned. For example, this works as expected: git submodule add git://someproject.com/.git someproject However,…

  Read the article

• Setting up Gitosis, where to create the repos?

  - by ReynierPM

  I'm trying to setup Gitosis on CentOS 6.2 but have some doubts/problems about it. I read this docs here, here and here but it's unclear to me where to configure where repositories are created. My server has a partition /data where I create a directory and called /gitrepos. I want all the repos created under that…

  Read the article

• Can not clone git repo to server

  - by Classified

  I'm running the same command on 2 different servers. One works, the other doesn't. I'm running git clone https://blah.com:8443/blah.git On server A, it works fine. I get the objects, files, etc. no problems. On server B, I get the following message. git clone https://blah.com:8443/blah.git Cloning into…

  Read the article

• Git/Mercurial (hg) opinion

  - by Richard

  First, let me say I'm not a professional programmer, but an engineer who had a need for it and had to learn. I was always working alone, so it was just me and my seven splitted personalities ... and we worked okey as a team :) Most of my stuff is done in C/Fortran/Matlab and so far I've been learning git to…

  Read the article

• What does "warning: unable to unlink website: Operation not permitted" mean when checking out a Git

  - by James A. Rosen

  I'm trying to create a local branch that tracks a remote branch. Here's what I get: > git checkout master > git push origin origin:refs/heads/myBranch Total 0 (delta 0), reused 0 (delta 0) To git@github.com:myrepo/myproject.git * [new branch] origin/HEAD -> myBranch > git fetch origin …

  Read the article

• Git remove directory

  - by hrickards

  I've got a repository on GitHub (http://github.com/hrickards/PHP-Crypto) for a little project me and a couple of others are working on. My development environment is Aptana Studio, and I use the EGit plugin as Aptana is basically Eclipse underneath. Today the designer sent the HTML and CSS for the website…

  Read the article

• How to force rebase when same changes applied to both branches manually?

  - by Dmitry

  My repository looks like: X - Y- A - B - C - D - E branch:master \ \ \ \ merge master -> release \ \ M --- BCDE --- N branch:release Here "M - BCDE - N" are manually (unfortunately!) applied changes…

  Read the article

• Git history cleanup doesn't seem to have an effect

  - by eaigner

  Hi, i ran the following 2 commands to clean up .pbxuser and .mode1v3 files from my git repository, but afterwards when i e.g. fire up gitx i can still see them in the history. git filter-branch --tree-filter "git rm -rf --cached --ignore-unmatch *.pbxuser" HEAD rm -rf .git/refs/original/ && git…

  Read the article

• Git: What is a tracking branch?

  - by jerhinesmith

  Can someone explain a "tracking branch" as it applies to git? Here's the definition from git-scm.com: A 'tracking branch' in Git is a local branch that is connected to a remote branch. When you push and pull on that branch, it automatically pushes and pulls to the remote branch that it is …

  Read the article

• Working with multiple GIT severs

  - by th3flyboy

  Hello, I have a question. Is it possible to set up a system so that you have a private GIT server that you host, which automatically syncs with a remote one, hosted by a site like Sourceforge, and then you can commit your local to the private GIT server, and then when you have to merge the changes from…

  Read the article

• "Project description file" error in git?

  - by Paul Wicks

  I've a small project that I want to share with a few others on a machine that we all have access to. I created a bare copy of the local repo with git clone --bare --no-hardlinks path/to/.git/ repoToShare.git I then moved repoToShare.git to the server. I can check it out with the following: git…

  Read the article

• How do I "merge" two separate git repositories of the same website without losing commit data?

  - by PHLAK

  I have two separate git repositories for the same version of a single website. domain.com-1.0 domain.com-2.0 Version 2.0 was completely redone from the ground up. There is no bridge between the two repositories. I would now like to merge the two into a single repository, but maintain the…

  Read the article

< Previous Page | 19 20 21 22 23 24 25 26 27 28 29 30  | Next Page >