branch | 易学教程

How can I easily apply a bugfix on several release branches in Git?

阅读更多关于 How can I easily apply a bugfix on several release branches in Git?

问题 I've been using git for a while for my one-man developments, but I haven't run into any tricky branching issues until now and I seem to have forgotten something fundamental that I no doubt "knew" just after reading the Pragmatic Version Control Using Git Book.. I'm often several releases ahead of what is actually published on my website, so that when a bug report comes in, I only apply them to the current master branch rather than fixing them in the next released version. Of course, I'd like

What's best way to work with git on multiple master branch?

阅读更多关于 What's best way to work with git on multiple master branch?

I have a git repo for my work project. The software is still under development but i have now three different branch "master" each with some little variations (graphical customization and different behaviour). I cannot merge automatically my development branch with these master branch, because every branch is differnet. I read about git cherry-pick but my question is: "is this the right way to work?" I really need this three different version of my project, maybe can i try to separate the "core" with the "customization" and works with git submoduele? thanks VonC You could use submodules if

Local branches with Bazaar?

阅读更多关于 Local branches with Bazaar?

I've been playing around with Git recently to get a grasp of distributed version control. Now I'm looking at Bazaar, but can't figure out how to make a local branch, i.e. a branch that I do not have to push to when I want to commit changes. With Git, I would do git branch branch_name or git checkout -b branch_name I can then work in my local branch, committing changes as I go, without having to push changes to a remote repo. When I'm through with the branch, I can merge it to my local master branch. If I want, I can then push those changes to the remote repo. Is this possible with Bazaar?

Create and merge a git branch to an epic branch

阅读更多关于 Create and merge a git branch to an epic branch

I am working on a project, for example, SO/bubbleSort and there I need to create an epic branch called feature/version-1 so from this epic branch there are few developers do the development, so for that, they need to create a separate branch from the epic branch. My question is how can we merge those changes and keep the epic branch with the latest changes. I have followed the following steps to do so. Is it correct? The first step checkout to the develop branch git checkout develop Create an epic branch under the develop branch git checkout -b feature/version-1 develop Create another branch

What does this do: git branch -f

阅读更多关于 What does this do: git branch -f

问题 I'm trying to figure out how to use this command properly. I believe this is the command and flag I want to essentially make one branch into my other branch (basically delete a branch and create a new branch with the same name with the files of another branch), but I don't know for sure, or if I have the syntax correct. If I do this: git branch -f master sub-branch Will it remove all of the files from master and fill it with the files from sub-branch? 回答1: The -f argument stands for --force .

How can I make Jenkins only build feature branches if they have changed when triggering from bitbucket

阅读更多关于 How can I make Jenkins only build feature branches if they have changed when triggering from bitbucket

问题 I have a Jenkins job that builds branches that match "origin/feature/**". Bitbucket triggers the job to build whenever there are changes to the repository via a repository hook (https://confluence.atlassian.com/display/BITBUCKET/Jenkins+hook+management). This works fine whenever there is a change on a feature branch, the job recognizes that the branch has changed and builds it. However, when there is a commit to a non-feature branch (eg. a merge to develop or master) bitbucket still triggers

Difference between `git branch -f <branch_name> <hash>` and `git checkout <branch_name>; git reset --hard <hash>` under a clean working tree?

阅读更多关于 Difference between `git branch -f ` and `git checkout ; git reset --hard ` under a clean working tree?

问题 Up until now, I have always used git checkout <branch_name>; git reset --hard <hash> to move a branch back to an earlier commit. Then I came across this question, but the answers and comments do not explain in great detail the differences between them. Assuming I have a clean working tree, what internal differences are there between git branch -f <branch_name> <hash> and git checkout <branch_name> git reset --hard <hash> and do such differences, if any, have any subtle implications for

Combining history of merged branches in GIT?

阅读更多关于 Combining history of merged branches in GIT?

In my git repository, I have merged branch "B" into "master", getting the the following structure: --> A --> B --> C --> D (branch master) | | F --> G --> H (branch B) I now want to combine the branches to get the following history: --> A --> B --> F --> G --> H --> D How can I do this? Regards, Jochen I assume C is a merge commit, and that's the reason you don't want to have it in your result. What you need, to do what you want, is git rebase Let's start of with yet another schematic commit graph. To leave the original branches intact we will operate on a new branch called rebasing git

Remove experimental branch

阅读更多关于 Remove experimental branch

问题 How do I remove a feature branch in mercurial if I want to remove it completely? It should be stripped from the history and I don't want to merge the changes in another branch (just throw the code away). I know that I can clone my other branches to a new repository like described here but that does not seem to be a clean solution. 回答1: I found a working solution here. It works by using hg strip from the mq extension: $ hg strip my_pruned_branch As mentioned in the comments, this should only

Best Practice: How to handle code differences for iOS App when creating free and paid version?

阅读更多关于 Best Practice: How to handle code differences for iOS App when creating free and paid version?

I want to release two versions, of my iOS App on the AppStore. One is paid and other is free. As of now my code is finished for the paid App. Now I want to add more code for iAd and InAppPurchase's for the free app. What is the best approach for maintaining the two versions? I was thinking about copying the Xcode Project or creating a branch in my git repo. If you branch or copy the project you're creating a maintenance nightmare for yourself down the road. Create a separate target in the same project, specific differences can be handled via #ifdef blocks in the code. Add defines to each