Search Results

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

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

• Git exclude a commit in a branch

  - by becomingGuru

  I have a commit, I have stored in a branch, because this should go only to a specific box. I have merged it to the branch master, but not the branch dev, that I use locally. Now, by mistake I merged master to dev and that introduced this commit to dev. I know can git revert sha, to branch dev; but since this is going to introduce a commit that undoes that commit (I am guessing, I haven't exactly tried this), when I merge master, will this commit be undone too? If so, how do I undo this commit only from the branch dev. And oh, git reset HEAD^1 --hard is not an option because there are other commits on master, after the un-needed commit. If reset back again and apply is the only option, then how do I only merge those extra commits from master other than the un-needed commit. Thanks in advance!

  Read the article

• Git - tidying up a repo

  - by Simon Woods

  Hi I have got my repo into a bit of a state and want to be able to work my way out of it The repo looks a bit like this (A1, B1, C1 etc are obviously commits) A1 ---- A2 ---- A3 ---- A4 ---- A5 ---- A6 ---- A7 ---- A8 / (from a remote repo) B1 ---- B2 --------------------------------- | \ \ C1 ---------------------------------C2 \ / D1 --- D2 --- D3 --- D4 --- D5 --- D6 Ideally I'd like to be able to remove all the revisions (with rebase?) on the B, C and D lines (I'm loathed to say branches simply because there are now no local branches on these lines except ref branches to the remote repo) and try to merge in the remote repo again, perhaps in a better way. I'd be grateful of any suggestions as to how to get rid of all these commits. Could I ask that any answers use revision SHA1s rather than branch names. I thought that somehow I'd be able to revert the merge into A7 but can't quite work out how to do it I hope that is sufficient information. Many thx Simon

  Read the article

• Importing already existing git repo with multiple branches and tags into gerrit

  - by Daniel

  I'm trying to import an already existing git repository with multiple branches and tags into gerrit. I'm following the official guide at https://gerrit-review.googlesource.com/Documentation/install-quick.html#_already_existing_project. However, when issuing the push command all the branches and tags, except "master" which I'm currently in, are "prohibited by Gerrit". The output is something like this: user@host:~/my-project$ git push ssh://user@localhost:29418/demo-project *:* [....] * [new branch] master -> master ! [remote rejected] origin/Branch1 -> origin/Branch1 (prohibited by Gerrit) ! [remote rejected] origin/Branch2 -> origin/Branch2 (prohibited by Gerrit) [....] ! [remote rejected] Tag1 -> Tag1 (prohibited by Gerrit) ! [remote rejected] Tag2 -> Tag2 (prohibited by Gerrit) [....] I'm administrator so it shouldn't be an access rights issue.

  Read the article

• Why darcs instead of git?

  - by Ctrl Alt D-1337

  Using pure functional languages can have a lot of benefits over using impure imperatives but low level systems languages will generally allow you to achieve much greater performance especially when they are imperative because it allows you to specify the exact steps in how the cpu should compute the result. If there is ever list of tools where high performance is an absolute must then I would put source version controls systems right at the top of that list and git achieves this very well but performance is not it's only advantage over many other other types of version control systems anyway. The git team are handling the unsafe c code very well and I never worry about my type system or any other features of the language it is written in so why is it that there is a lot of haskell developers that must use darcs when they will only be using the finished product?

  Read the article

• Git: hide commit messages on remote repo

  - by Sebastian Bechtel

  Hi, I don't know how to bring my problem on the point so I try to explain it a bit ;-) When working with git on my local maschine I usually commit a lot. For this I use topic branches. Then I merge such a topic branch into a branch called develop which will be pushed to a remote repo. I always merge with --no-ff so their is always a commit for my whole topic. Now I'd like to only push this commit with a specified description what I did on the whole in this branch. I would prefer this because you can look at the commit history on the server and see directly what happend and don't need to read every single commit. And for my local work I would have the full history if I want to reset my branch or something similar. I don't know if their is a way to do this in git but it would be very useful for me so I give it a try to ask you ;-) Best regards, Sebastian

  Read the article

• Git and Mercurial - Compare and Contrast

  - by TM

  For a while now I've been using subversion for my personal projects. More and more I keep hearing great things about Git and Mercurial, and DVCS in general. I'd like to give the whole DVCS thing a whirl, but I'm not too familiar with either option. What are some of the differences between Mercurial and Git? Note that I'm not trying to find out which one is "best" or even which one I should start with. I'm mainly looking for key areas where they are similar and where they are different, because I am interested to know how they differ in terms of implementation and philosophy.

  Read the article

• Free hosting service for private and public git repositories

  - by Alexander

  Hi, does anyone know a free service for hosting private and public git repositories? There are a lot of services like for example the well known github. Most of them only allow hosting of public repositories. I want to host one or more of my private programming projects using git, but not all of them should be public (at least not for now). I also found the free service GitFarm which is build using the Google App Engine technology, but i couldn't find any information how it works (don't know what "built on Google App Engine technology" means) or if there are any other limitations. Also it seams like there is no web front-end available. An integrated web front-end, bug tracker and stuff like this would also be a big plus!

  Read the article

• git: how to squash the first two commits?

  - by kch

  With git rebase --interactive <commit> you can squash any number of commits together into a single one. It's an OCD heaven. And that's all great unless you want to squash commits into the initial commit. That seems impossible to do. Any way to achieve it? Moderately related: In a related question, I managed to come up with a different approach to the need of squashing against the first commit, which is, well, to make it the second one. If you're interested: git: how to insert a commit as the first, shifting all the others?

  Read the article

• Google App Engine and Git best practices

  - by systempuntoout

  I'm developing a small pet project on Google App Engine and i would like to keep code under source control using github; this will allow a friend of mine to checkout and modify the sources. I just have a directory with all sources (call it PetProject) and Google App Engine development server points to that directory. Is it correct to create a repo directly from PetProject directory or is it preferable to create a second directory mirroring the develop PetProject directory? In the latter case, anytime my friend will release something new, i need to pull fetch from Git copying the modified files to the develop PetProject directory. If i decide to keep the repo inside the develop directory, skipping .git on Gae yaml is enough? What are the best practices here?

  Read the article

• Fixing warning from git

  - by japancheese

  I've been doing a workflow of making a git repository on a remote central repository, cloning that repo on my local dev machine, doing some work, and then pushing the changes back to the same repo on the remote server. However, and I believe this was after an update I did to git recently, after pushing up a change, I'm getting the following warning: Counting objects: 2724, done. Delta compression using up to 2 threads. Compressing objects: 100% (2666/2666), done. Writing objects: 100% (2723/2723), 5.90 MiB | 313 KiB/s, done. Total 2723 (delta 219), reused 0 (delta 0) warning: updating the currently checked out branch; this may cause confusion, as the index and working tree do not reflect changes that are now in HEAD. Can someone explain to me exactly what this warning means, and what I'm doing wrong in my workflow to not receive this warning?

  Read the article

• Mirror a git repository by pulling?

  - by corydoras

  I am wondering if there is an easy way, ie like a simple cron job, to regularly pull from a remote git repository to a local read only mirror for backup purposes? Ideally it would pull all branches and tags, but the master/trunk/head would be sufficient. I just need a way to make sure that if the master git server dies, we have a backup location that we could manually fail over to. (I have been googling and reading documentation for help on how to do this for quite some time now and the furthest I have gotten is a bash script that does pull's on a regular interval.)

  Read the article

• Git ignore file for vb.net projects

  - by John C

  Placing a vb.net project under git control in windows (was previously under VSS - long sad story of repository corruption, etc). How should I set up the ignore file? The exclusions I'm thinking of using are: *.exe *.pdb *.manifest *.xml *.log (is git case sensitive on windows? Should I exclude *.Log as well?) *.scc (I gather these were left over from VSS - maybe I should delete them?) Is this a sensible list? Should I be excluding directories?

  Read the article

• git rebase branch with all subbranches

  - by knittl

  is it possible to rebase a branch with all it's subbranches in git? i often use branches as quick/mutable tags to mark certain commits. * master * * featureA-finished * * origin/master now i want to rebase -i master onto origin/master, to change/reword the commit featureA-finished^ after git rebase -i --onto origin/master origin/master master, i basically want the history to be: * master * * featureA-finished * (changed/reworded) * origin/master but what i get is: * master * * (same changeset as featureA-finished) * (changed/reworded) | * featureA-finished |.* (original commit i wanted to edit) * origin/master is there a way around it, or am i stuck with recreating the branches on the new rebased commits?

  Read the article

• How to skip "Loose Object" popup when running 'git gui'

  - by Michael Donohue

  When I run 'git gui' I get a popup that says This repository currently has approximately 1500 loose objects. It then suggests compressing the database. I've done this before, and it reduces the loose objects to about 250, but that doesn't suppress the popup. Compressing again doesn't change the number of loose objects. Our current workflow requires significant use of 'rebase' as we are transitioning from Perforce, and Perforce is still the canonical SCM. Once Git is the canonical SCM, we will do regular merges, and the loose objects problem should be greatly mitigated. In the mean time, I'd really like to make this 'helpful' popup go away.

  Read the article

• Git Specify Remote Source Durring Push

  - by ThinkBohemian

  I have a local git repository a "central" repo at github. I'm working on a part of a project, while a friend is working on a related piece that is its entirely seperate repo, is it possible for me to simply link directly to my friends repo? For example, the app is called widgets. I have all my code in widgets/app/mycode and my friend is writing code that goes into widgets/plugins/awesome/hiscode. I want to be able to always have http://github.com/mycode/widgets/plugins/hiscode to be a direct link or clone to http://github.com/hiscode/awesome ? It could be possible i'm missing something basic in my question or knowledge of git, if so please ask, and i'll be happy to try to fill in the blanks.

  Read the article

• Error finding tcl.init when running Git GUI

  - by Leslie

  I get the following error message when I try to start the Git GUI: Error in Wish Can't find a usable init.tcl in the following directories: ... [list of directories follows, init.tcl is in the first one listed] This probably means that Tcl wasn't installed properly. I'm running Windows 7 and I'm sure this problem is related to that, but I don't know where to start. I can, and most often will, use the Bash tool, but it annoys me that this doesn't work. I installed the msysgit package: Git-1.7.0.2-preview20100309.exe

  Read the article

• How do you do merges using Git, Eclipse and Egit

  - by PaulHurleyuk

  I, like many others, love Eclipse as my ide of choice, and because of the way I work (moving about, different places, different projects) want to use Git for CVS. There is a plugin for Git in Eclipse, Egit, which is now an official Eclipse project, and currently at version 0.7.1. As I've just started using it I'm interested in how others are using it, and what work arounds they are using. Currently Egit doesn't have support for merges, so these have to be done outside of Eclipse and then the workspace refreshed. So, How do you do this task ? (and any other tasks that Egit doesn't do right now)

  Read the article

• Git: how do you merge with remote repo?

  - by Marco

  Please help me understand how git works. I clone my remote repository on two different machines. I edit the same file on both machines. I successfully commit and push the update from the first machine to the remote repository. I then try to push the update on the second machine, but get an error: ! [rejected] master -> master (non-fast-forward) I understand why I received the error. How can I merge my changes into the remote repo? Do I need to pull the remote repo first?

  Read the article

• Best practice for Google app engine and Git.

  - by systempuntoout

  I'm developing a small pet project on Google App Engine and i would like to keep code under source control using github; this will allow a friend of mine to checkout and modify the sources. I just have a directory with all sources (call it PetProject) and Google App Engine development server points to that directory. Is it correct to create a Repo directly from PetProject directory or is it preferable to create a second directory (mirror of the develop PetProject directory); in this case, anytime my friend will release something new, i need to pull from Git and then copy the modified files to the develop PetProject directory. If i decide to keep the Repo inside the develop directory, skippin .git on yaml is enough? What's the best practice here?

  Read the article

• Git to SVN trouble

  - by Kevin

  My boss has a Perforce repository for which he wants to make a read-only copy available on Sourceforge via subversion. He had a perl script which would do this but it's no longer functioning (we don't want to try debugging it yet) and it's really not that great anyway. So an alternate solution is to pull the perforce repo into git as a remote ref, which I have already done successfully (including all the proper commit details and authors), now the trouble I'm having is pushing it out to a separate SVN repository. I can make it start the commit process with "git svn dcommit --add-author-from", but the problem is even though the correct author appears at the end of the commit message the "real" author committing is my machine's user. I want to preserve the real author with the commit, and I'd also like to preserve the original timestamps as well. Is anyone familiar with how I could accomplish this?

  Read the article

• Merge changes when a file on a branch has split into two files on the master

  - by carleeto

  This is basically the result of a massive class C on the master having been refactored down the line into two smaller classes, C1 and C2. C was then made a subclass of C2 and cut down to a skeletal version for backward compatibility. So from that point on, master contained C, C1 and C2. On that master commit git said C was renamed to C1. The branch was last updated before this happened. (All C++ code, if it helps to visualize the files involved) Obviously, when I tried a rebase of the branch onto master, there were conflicts that needed to be resolved. As usual, I used mergetool. So now the mergetool comes up with the following: On Local, I have the skeletal version of C. Base and Remote have a bunch of changes to C. Because the skeletal version of C exists on Local, I conclude that the changes from Base and Remote should actually go into C1, leaving C alone. My question is, how do I do this?

  Read the article

• Git Status Across Multiple Repositories on a Mac

  - by eapen

  I have been searching for a solution to this for a while and have not found quite what I need. I have several Git Repositories in a folder on my Mac (OSX 10.6) and would like a script or tool that will loop through all the repositories and let me know if any of them needs "commit"-ing. This is my structure Sites   /project1   /project2   /project3 I want the tool to do a "git status" in Sites/project1, Sites/project2, Sites/project3 and let me know if Sites/project2 and Sites/project3 have changes or new files and needs to be Staged/committed The closest script I found that might be hackable is here: http://gist.github.com/371828 but even that script wouldn't run and I get an error: "syntax error near unexpected token `do" which might have been written for *nix.

  Read the article

• Non-Git Github?

  - by Mihir Singh

  This is probably a really weird question... but is there a non-git Github? I want a place to post my projects and share my code (like Github) but I don't want to have to works with versions, commits, etc. I don't like having to create a link between my folder and my git repo and then push the changes etc. In addition, I don't want to have to have a local copy to create or add files; I can edit existing files in Github, but to create or add files, I have to do it locally and then commit and push. I'm not sure if this is the best site to ask on, but I figured someone might have the answer. Thanks in advance.

  Read the article

• In Jenkins, how to checkout a project into a specific directory (using GIT)

  - by viebel

  Sorry for the 'svn' style - we are in a process of migration from SVN to GIT (including our CI Jenkins environment). What do we need is to be able to make Jenkins to checkout (or should I say clone?) the GIT project (repository?) into a specific directory. We've tried some refspecs magic but it wasn't to obvious to understand and to use successfully. Furthermore, if in the same Jenkins project we need to checkout several private GitHub repositories into several separate dirs under a project root. How can we do it please? We have GitHub plugin installed. Hope we've phrased the things right.

  Read the article

• Parent/master project in git

  - by jriff

  I have a project "A" that is a Git repository. I would like to be able to make multiple copies of project A (B and C), and modify them for clients. "A" is the master so sometimes when I do new functionality i would like to be able to pull them into B or C. But some commits should just stay in A and only be used if making a new clone. How do I do that with Git? That is: how to copy A? (Clone?) how to get specific commits into B and C? Please keep in mind that this all happening locally - not on GitHub. I use OS X.

  Read the article

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