branch | 易学教程

Does a bisect in version control benefit from using a rebaseif workflow?

阅读更多关于 Does a bisect in version control benefit from using a rebaseif workflow?

问题 The rebaseif mercurial extension automates the process, when pulling, of doing a rebase only if the merge can be done automatically with no conflicts. (If there are conflicts to resolve manually, it does not rebase, leaving you ready to do a manual merge of the two branches.) This simplifies and linearizes the history when developers are working in different parts of the code, although any rebase does throw away some information about the state of the world when a developer was doing work. I

Is there a way to make a local branch immutable?

阅读更多关于 Is there a way to make a local branch immutable?

问题 I'm extremely stupid and sometimes I merge a "feature branch" in the wrong master branch as opposed to the develop branch and that of course leads to pain and suffering. Since it's the second time already that this has been happening, I wonder if there's a way for me to make a branch immutable locally. I've already tried with this pre-commit hook to prevent me from directly making commits on said branch, but this is not stopping merges as in: git checkout master git merge wip Is there a way

git: How to create a branch of my current work, but stay on my original branch

阅读更多关于 git: How to create a branch of my current work, but stay on my original branch

问题 I'm on a branch (let's say master), and I have some changes in my working dir. I get stuff working, but needing a lot of cleanup - so I'd like to save my current working dir to a branch just in case I need to go back to it. I'll definitely be deleting the branch later. In addition, I want to continue working on master EXACTLY where I was. Right now I do: # Save to topic branch git checkout -b working-stuff git commit -a -m "work in progress" # go back to master and continue with the state is

Git pull reverted commits in master?

阅读更多关于 Git pull reverted commits in master?

问题 A colleague, whom we'll call Aaron, was assigned to renovate a section of a website as a long-term project. He created a new Git branch, called aaron . All his changes were made on this branch. While he was working, I continued to maintain the site as a whole, committing my changes to master . Eventually, Aaron merged his branch into master . This somehow reverted all of the commits I'd made to master between the time of the merge and the time when the aaron branch was first created. If I

Git new file appears in all branches

阅读更多关于 Git new file appears in all branches

问题 I thought a file created on one branch will not appear in any other branches until I merge or rebase the branch? Example: I have two branches: master new_contact_page I checkout the new_contact_page branch. $ git checkout new_contact_page Then I create a new file. $ vi contact_page.html Without doing any Git commands, I switch back to my Master branch. $ git checkout master Then I see that this contact_page.html file is also in my Master branch. $ ls (contact_page.html shows up in the list!)

Can I use Team Explorer to merge changes between two branches after an initial baseless merge?

阅读更多关于 Can I use Team Explorer to merge changes between two branches after an initial baseless merge?

问题 My understanding of a baseless merge in TFS was that it was a one-time deal, and merges afterwards could be made without having to be baseless: from http://msdn.microsoft.com/en-us/library/bd6dxhfy(VS.80).aspx /baseless - Performs a merge without a basis version. That is, allows the user to merge files and folders that do not have a merge relationship. After a baseless merge, a merge relationship exists and future merges do not have to be baseless. However, I tried it this evening with the

TFS Branch refused to go

阅读更多关于 TFS Branch refused to go

问题 We are on TFS 2010 and clients being used are VS 2008, VS 2010 and VS 2012. I use the VS 2010 feature to view TFS hierarchy feature to visualize my TFS branch setup and maintain it. Question, is that once the work on a branch is complete, I right click and 'Delete' it. After deletion, if I open hierarchy visualization again, sometimes branch box gets removed from the visualization as expected, but sometimes, even though the branch is deleted, it refused to go away from the visualization. Why

git-svn isn't committing to branches, only trunk

阅读更多关于 git-svn isn't committing to branches, only trunk

问题 I'm working with an SVN repository that is laid out like this: $SVN/[project]/trunk $SVN/[project]/branches/[user]/[branch] $SVN/[project]/tags/releases/[tag] My .git/config looks like this: [svn-remote "svn"] url = $SVN fetch = project/trunk:refs/remotes/trunk branches = project/branches/*/*:refs/remotes/* When I look at git branch -a, I see all the remote branches. Let's say I want to check one out, work on it, then commit the changes back. Here's is what I am trying to do: git checkout -b

Git- Tracking remote branches

阅读更多关于 Git- Tracking remote branches

问题 I am a Mercurial user, and I am confused about the behaviour of remote branches. I have a remote branch origin/dev , and I want to replicate it on a local branche dev . What I would like is that: whenever I git pull , changes to origin/dev are merged into dev whenever I git push , changes to dev are merged into origin/dev So I created a tracking branch with git branch --track dev origin/dev which, to the best of my knowledge, should do exactly what I need. Still, I was working on a feature

how to keep git submodule on-branch status after cloning superproject?

阅读更多关于 how to keep git submodule on-branch status after cloning superproject?

I am testing the new git submodule add -b feature (after git 1.8.2), which creates sub-module that allegedly tracks a branch rather than a commit. I am using git version 1.8.4.msysgit.0 . The branch-tracking feature for submodules seems to work fine in the original super-project but fails as soon as the super-project is cloned. To be more specific: What I did is typical, and is roughly as follows, 1. create a git repo (called common): ... 2. create a main project (called main), which uses common as a library/submodule. mkdir main && cd main git init git submodule add -b master url_to_common