Search Results

Search found 1622 results on 65 pages for 'branch'.

Page 9/65 | < Previous Page | 5 6 7 8 9 10 11 12 13 14 15 16  | Next Page >

• Git: Merge in only one commit

  - by Ivan

  Usually, I work with branches in Git, but I don't like to see hundreds of branches in my working tree (Git history). I'm wondering if there is a method in Git to "join" all commits in a branch in only one commit (ideally with a clear commit message). Something like this: git checkout -b branch <some work> git commit -a -m "commit 1" <some work> git commit -a -m "commit 2" <some work> git commit -a -m "commit 3" git checkout master git SUPER-JOIN branch -m "super commit" After this, only "super commit" will exist in the git log.

  Read the article

• How should my local git workflow work?

  - by Anonymous -

  At home, I have a server that is running some software (on a LAMP stack, but only accessible internally). I have another machine and a laptop that I both use for developing said software. What is the best workflow for me? Should I have a repository on my local server, create a live branch, staging branch and development branch, then checkout the development branch from my laptop/development PC to work on, commit that back when I'm done, then merge the development branch with the staging branch for testing, before further merging to the live branch? Would I simply checkout the production branch to my /www/var/ on my server? Or am I thinking/going about this all wrong? Thanks.

  Read the article

• Migrating complex SVN branch hierarchy to Mercurial

  - by Christian Hang

  Our team has been using SVN for managing an application of decent size and over time a rather complex hierarchy of branches and tags has built up, which is following the basic standard layout for SVN repositories, but is more nested: |-trunk |-branches | |-releases | | |-releaseA | | `-releaseB | `-features | |-featureX | `-featureY |-tags |-releaseA | |-beta | `-RTP `-releaseB |-beta `-RTP (The feature branches are obviously temporary branches but we have to take them into consideration as it won't be feasible to close all of them at once in the near future) For several reasons but primarily because merges have been becoming an increasing pain, we are considering to switch to Mercurial. The main problem we are currently facing is migrating the existing code base without losing our history. I've tried several migration tools (e.g., yasvn2hg, hg convert and svn2hg) with yasvn2hg being the most promising, but none of them seem to be able to deal with nested hierarchies but they all assume that branches and tags are organized in one flat directory respectively. The choice between named branches or clones as the conversion target of old SVN branches is not a limiting factor in this case, as either solution would be appreciated. We are currently experimenting with both options and how they would fit into our current processes but haven't decided on one yet. I'd obviously be interested in recommendations or experiences with similar setups concerning that issue as well. So, what is the best way to convert a nested SVN branch hierarchy like this to Mercurial? Converting one branch at a time into a separate repository would be quite annoying and I am not sure if that would be the right approach in the first place, depending on how the tools handle historic merges and need to be aware of all other branches?

  Read the article

• Git-svn refuses to create branch on svn repository error: "not in the same repository"

  - by Danny

  I am attempting to create a svn branch using git-svn. The repository was created with --stdlayout. Unfortunately it generates an error stating the "Source and dest appear not to be in the same repository". The error appears to be the result of it not including the username in the source url. $ git svn branch foo-as-bar -m "Attempt to make Foo into Bar." Copying svn+ssh://my.foo.company/r/sandbox/foo/trunk at r1173 to svn+ssh://[email protected]/r/sandbox/foo/branches/foo-as-bar... Trying to use an unsupported feature: Source and dest appear not to be in the same repository (src: 'svn+ssh://my.foo.company/r/sandbox/foo/trunk'; dst: 'svn+ssh://[email protected]/r/sandbox/foo/branches/foo-as-bar') at /home/me/.install/git/libexec/git-core/git-svn line 610 I intially thought this was simply a configuration issue, examination of .git/config doesn't suggest anything incorrect. [svn-remote "svn"] url = svn+ssh://[email protected]/r fetch = sandbox/foo/trunk:refs/remotes/trunk branches = sandbox/foo/branches/*:refs/remotes/* tags = sandbox/foo/tags/*:refs/remotes/tags/* I am using git version 1.6.3.3. Can anyone shed any light on why this might be occuring, and how best to address it?

  Read the article

• Using git pull to track a remote branch without merging

  - by J Barlow

  I am using git to track content which is changed by some people and shared "read-only" with others. The "readers" may from time to time need to make a change, but mostly they will not. I want to allow for the git "writers" to rebase pushed branches** if need be, and ensure that the "readers" never accidentally get a merge. That's normally easy enough. git pull origin +master There's one case that seems to cause problems. If a reader makes a local change, the command above will merge. I want pull to be fully automatic if the reader has not made local changes, while if they have made local changes, it should stop and ask for input. I want to track any upstream changes while being careful about merging downstream changes. In a way, I don't really want to pull. I want to track the master branch exactly. ** (I know this is not a best practice, but it seems necessary in our case: we have one main branch that contains most of the work and some topic branches for specific customers with minor changes that need to be isolated. It seems easiest to frequently rebase to keep the topics up to date.)

  Read the article

• Error with git: remote HEAD is ambiguous, may be one of the following

  - by vfclists

  After branching and pushing to the remote, a git remote show origin gives the report HEAD branch (remote HEAD is ambiguous, may be one of the following): master otherbranch What does the imply? It is a critical error? remote origin Fetch URL: [email protected]:/home/gituser/repos/csfsconf.git Push URL: [email protected]:/home/gituser/repos/csfsconf.git HEAD branch (remote HEAD is ambiguous, may be one of the following): master otherbranch

  Read the article

• Error with git: remote HEAD is ambiguous, may be one of the followin

  - by vfclists

  After branching and pushing to the remote, a git remote show origin gives the report HEAD branch (remote HEAD is ambiguous, may be one of the following): master otherbranch What does the imply? It is a critical error? remote origin Fetch URL: [email protected]:/home/gituser/repos/csfsconf.git Push URL: [email protected]:/home/gituser/repos/csfsconf.git HEAD branch (remote HEAD is ambiguous, may be one of the following): master otherbranch

  Read the article

• What are the differences between GIT and SVN when it comes to merge conflicts solving.

  - by chalup

  I keep hearing that branching in git is so much easier than in SVN, because it's easier to merge the branch back to trunk/master. I've read some tutorials, but they only covered basic merge conflicts ("Alice changed line 8 of code.cpp and at the same time Bob changed line 8 of code.cpp...") and there are no differences between SVN and all other distributed source control systems. Can you give me the examples of changes in branch that would cause troubles in SVN repository, but would be handled gracefully by git?

  Read the article

• hg convert from cvs broke branches

  - by luminger

  I converted an old cvs repository into mercurial via "hg convert". Everything seemed to be okay (at least with the default branch) but all feature branches are missing files which haven't been changed in the branch. Is there any way to fix this up? I'm using version 1.5, convert has been done via "hg convert cvs/checkout newrepo".

  Read the article

• How can I rewrite the history of a published git branch in multiple steps?

  - by Frerich Raabe

  I've got a git repository with two branches, master and amazing_new_feature. The latter branch contains the work on, well, an amazing new feature. A colleague and me are both working on the same repository, and the two of us commit to both branches. Now the work on the amazing new feature finished, and a bit more than 100 commits were accumulated in the amazing_new_feature branch. I'd like to clean those commits up a bit (using git rebase -i) before merging the work into master. The issue we're facing is that it's quite a pain to rewrite/reorder all 100 commits in one go. Instead, what I'd like to do is: Rewrite/merge/reorder the first few commits in the amazing_new_feature branch and put the result into a dedicated branch which contains the 'cleaned up' history (say, a amazing_new_feature_ready_for_merge branch). Rebase the remaining amazing_new_feature branch on the amazing_new_feature_ready_for_merge branch. Repeat at 1. My idea is that at some point, all the work from amazing_new_feature should be in amazing_new_feature_ready_for_merge and then I can merge the latter into master. Is this a sensible approach, or are there better/easier/more fool-proff solutions to this problem? I'm especially scared about the second step of the above algorithm since it means rebasing a published branch. IIRC it's a dangerous thing to do.

  Read the article

• No "Terminal Services" branch in "Group Policy Object Editor"

  - by ayavilevich

  Hi, We have several identical several servers in a hosting company. They run Windows 2003 R2 Std SP2 64bit. The servers are not in a domain. We have recently received a new server with the same configuration and hardware. However, the new server is different in some way. When we run "gpedit.msc /s" there are much less options in the tree than the other servers. Specifically we are missing the configuration of "Terminal Services". Many other items are missing under "Administrative templates" and "Windows components". Screenshot of correct server: (can't post link due to SF policy) Screenshot of new server: http://img686.imageshack.us/img686/572/gpowindowscomponentstp5.png What should we try? Thanks, Arik.

  Read the article

• WPF TreeView - How to scroll so expanded branch is visible

  - by Jared

  When I expand items in my treeview so that scrolling is necessary, a scrollbar appears. However, it doesn't scroll down for the newly expanded branch of items - they get cropped by the bottom of the control. So as I continue expanding items at the bottom of the tree, I have to keep manually scrolling down to see the new children. Anyone have a suggestion for how make it automatically scroll to show the newly expanded items?

  Read the article

• how to find the branch for a given lable

  - by Haiyuan Zhang

  I try to use: cleatool lstype lbtyep:some_lable but the output does not tell me which branch the lable is in. so need your help.

  Read the article

• Git: Finding what branch a commit came from

  - by Ethan Gunderson

  I'm pretty sure this isn't possible, but is there anyway to find out what branch a commit comes from given its sha1? Bonus points if you can tell me how to accomplish this using grit. :)

  Read the article

• github - Adding a file to branch

  - by Fiona

  Hi there, So I'm following thiese instructions:http://mark-kirby.co.uk/tag/osx/ and so far i've cloned the project I want to work on and created a branch. Now I wish to add files that exist in another folder on my machine... but I keep getting the following: fatal: pathspec 'Users/mic/OnePageCRMVC/MKTsite25-05/index.html' did not match any files However, the file definitely does exist... Am I trying to do something that is not allowed and the error message is throwing me off? Regards, Fiona

  Read the article

• TFS Branch Parent

  - by pm_2

  Is it possible in TFS 2008 to alter the parent of a branch? I've heard this will be available in 2010, but was wondering if there was an equivelent in 2008 (even if it's more long winded)?

  Read the article

• Git branch unknown to local clone

  - by Rimian

  I have a git repository with two branches. If I clone my repo I can only see the master branch. I have both branches up to date. The problem is I don't fully understand merging and branching. Darn it! My example can be seen here: http://github.com/rimian/rimian/network Can anyone tell me how to get this back to normal?

  Read the article

• Is OOP based on any branch of mathematics?

  - by ektrules

  I know relational databases are based on set-theory, functional programming is based on lambda calculus, logic programming is based on logic (of course :)), and now that I think of it; I'm not sure if imperative and generic programming is based on any particular branch of mathematics either.

  Read the article

• SVN branch question

  - by aspdotnetuser

  Hi, When creating a branch, what are the implications of selecting the following? Create copy in the repository from: HEAD revision in the repository Specific revision the repository Working copy

  Read the article

• How can I git archive an arbitrary branch?

  - by rpflo

  git checkout master git archive stage | tar -czf archive.tar.gz htdocs # archives master because it's checked out. How can I archives the stage branch, regardless of the current I'm on?

  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

• Subversion Deployment tools: specify branch/tag, revision and target machine

  - by Terman

  What are some non commercial deployment tools that allows a developer to speficy: a branch/tag, a revision and a target machine to deploy code to? I was wondering if there's a ccnet plugin of some sort that would allow the above to be specified. I know this could be done with a NAnt deploy script. However considering we're mostly using gui tools for feedback, plus the tortoise svn repository browser, it be cool to lear if there's an GUI simple GUI tool/plugin cheers.

  Read the article

• How do I branch if message.properties-code exists

  - by skurt

  I want to branch if a message-property-code does exist or not. <g:if test="${message(code: 'default.code.foo')}"> true </g:if><g:else> false </g:else> should answer true if there a message property named default.code.foo and false if not. It fails because it answers the code if there is no property for it.

  Read the article

• Can I version dotfiles within a project without merging their history into the main line?

  - by istrasci

  I'm sure this title is fairly obscure. I'm wondering if there is some way in git to tell it that you want a certain file to use different versions of a file when moving between branches, but to overall be .gitignored from the repository. Here's my scenario: I've got a Flash Builder project (for a Flex app) that I control with git. Flex apps in Flash Builder projects create three files: .actionScriptProperties, .flexProperties, and .project. These files contain lots of local file system references (source folders, output folders, etc.), so naturally we .gitignore them from our repo. Today, I wanted to use a new library in my project, so I made a separate git branch called lib, removed the old version of the library and put in the new one. Unfortunately, this Flex library information gets stored in one of those three dot files (not sure which offhand). So when I had to switch back to the first branch (master) earlier, I was getting compile errors because master was now linked to the new library (which basically negated why I made lib in the first place). So I'm wondering if there's any way for me to continue to .gitignore these files (so my other developers don't get them), but tell git that I want it to use some kind of local "branch version" so I can locally use different versions of the files for different branches.

  Read the article

• How do I manage multiple development branches in GIT?

  - by Ian

  I have 5 branches of one system - lets call them master, London, Birmingham, Manchester and demo. These differ in only a configuration file and each has its own set of graphics files. When I do some development, I create a temp branch from master, called after the feature, and work on that. When ready to merge I checkout master, and git merge feature to bring in my work. That appears to work just fine. Now I need to get my changes into the other Branches, without losing the differences between then that are there already. How can I do that? I have been having no end of problems with Birmingham geting London's graphics, and with conflicts within the configuration file. When the branch is finally correct, I push it up to a depot, and pull each Branch down to a linux box for final testing, From there the release into production is using rsync (set to ignore the .git repository itself). This phase works just fine also. I am the only developer at the moment, but I need to get the process solid before inviting assistance :)

  Read the article

< Previous Page | 5 6 7 8 9 10 11 12 13 14 15 16  | Next Page >