branching-and-merging | 易学教程

Moving master head to a branch

阅读更多关于 Moving master head to a branch

I have several feature branches and a master branch. Feature2 is done. Normally I would rebase (working with a remote SVN repo and would like to keep the history, so no regular merge) and ff-merge. But since master hasnt changed since I branched, I would like to move the master head (at E ) to G . Using git branch -f master G does not result in any visible changes, I assumed this is because G is on a different branch. Is it safe to use git update-ref -f master G here instead? Should I stick with rebase/ff-merge? Something even better? feature1 C-D / master A-B-E \ feature2 F-G Thank you. A

SVN - automate merge of trunk into branch

阅读更多关于 SVN - automate merge of trunk into branch

问题 I have a branch in SVN that I want to keep up to date with changes from the trunk. What I would like to do is have a script or something that runs nightly that does this merge and then commits the new version of the branch if there are no merge conflicts but if there are merge conflicts somehow indicate so. I found this post that is somewhat helpful although it doesn't do everything. I have been unable to find a way to determine whether there are merge conflicts and this is mostly what I'm

git — locking master branch for some users?

阅读更多关于 git — locking master branch for some users?

问题 I would like to force other team-members to not work on the master-branch but on a development branch. we have a central git-repository where we push our work into. i would like to know if it's possible to block users from pushing changes to the master-branch but only allow certain users to do so. I would like to have the following "workflow" development is always only done with a development-branch the release-manager is responsible for the master branch and only he is allowed to merge stuff

How can I overwrite, not merge, one remote branch into another branch?

阅读更多关于 How can I overwrite, not merge, one remote branch into another branch?

问题 I have two branches. Staging and Beta. Staging has code in it ( including files ), that I do not want at all. How can I make Beta completely overwrite Staging, so that none of those files or code are merged from Staging into Beta. I see some people recommend doing this : git checkout staging git merge -s ours beta But I don't believe the pre-existing files would be a "code conflict" and therefore would not be removed. Am I wrong? If I'm right, how would I accomplish this? 回答1: You can simple

Git merging hotfix to multiple branches

阅读更多关于 Git merging hotfix to multiple branches

问题 I've been trying to wrap my head around git branching models. I've been looking at http://nvie.com/posts/a-successful-git-branching-model/ for some ideas and coming from Subversion one thing I was really looking forward to was making a change in a single place and merging it to all the branches that needed it. In Subversion, we ended up doing to much copy of code around. However I still don't get this completely. Here is a standard type of workflow that I have and it will always come up with

Is it possible to get a list of merges into a branch from the Github website OR API?

阅读更多关于 Is it possible to get a list of merges into a branch from the Github website OR API?

问题 In our workflow, no "direct" commits are made into the master branch. The master branch only receives merges from Pull Requests. We can think of each merge then as a new feature added to the master branch. So I'd like to get a list of merges into master, as a way to visualize the blocks of features added into the product over time. Does git or the Github API expose this query, or do I have to parse raw commits? 回答1: I use the following script: git log --merges --first-parent master \ --pretty

Git branching model strategy

阅读更多关于 Git branching model strategy

We are trying to follow the gitflow branching model, but with a twist. We have have four servers environments where the product can be deployed to, each server serves a purpose : development, internal testing, external testing, and production. DevServer , where developers test their different features, while developing. Developers cannot test locally on their machines, they have to make their changes on the DevServer to be able to test TestServer , where QA testers test multiple features once developers are done ReleaseServer , where releases are tested in isolation before moving them to

Folder converted to branch?

阅读更多关于 Folder converted to branch?

In TFS (We are using 2012) why is the default to convert your source folder to a branch? I really don't consider the source a branch. What, if any, advantages/disadvantages does this have? I'm not sure what you mean by "I don't consider the source a branch" the source folder by definition becomes a branch as soon as you create a branch from it. The target folder is also a branch which is a child of the source branch. There are no disadvantages to enabling this. Regardless of whether you have this enabled or not the Source and Target will have a branching relationship and you will be able to

Mercurial - close default branch and replace with a named branch as new default

阅读更多关于 Mercurial - close default branch and replace with a named branch as new default

问题 In a mercurial repo, the "default" branch has fallen very out of date to the point where it no longer makes sense to merge in the changes from "develop", a named branch which has the latest deployed version of the application. Instead of merging develop into default, how can I close the current default branch and then create a new default branch using the head from develop? I've seen a few other questions and answers which are similar, perhaps the same, but I am still having trouble

Unshelve to another branch

阅读更多关于 Unshelve to another branch

问题 I'm trying to unpack my changes to the another branch using TFS Power Tools. I'm trying to execute command tfpt unshelve /migrate "NuGet Build" "/source:$/ProjectName/Main/Source" "/target:$/ProjectName/Main/Source-NuGet" But it returns message 'tfpt : Unable to determine the workspace' . I'm running command from the directory that mapped to this project. Moreover I've tried to use tf workspaces /s:http://our-tfs . Does anyone know how to solve this problem? 回答1: You can define your path in