branching-and-merging

I have a master branch and a feature branch. The feature branch has several changes but the master branch has many changes like removing 10 projects from the repository. The question is how to merge the feature branch back to master branch? 1) merge feature with master and then master with feature OR 2) merge master with feature directly checkout master checkout -b develop (assuming you don't already have a develop branch) merge --no-ff your-feature-branch Resolve any conflicts in code. Test, test test. checkout master merge --no-ff develop Then deploy your code. I really like this branching

The convention when using git and you want to get changes from the server is: git fetch git merge origin/master I know there is also git pull , but my specific question is about the syntax origin/master . What does the master part do? If I just do git merge origin (without the master ) it seems to work. I know master is a branch, but if I'm tracking more than one branch of a remote, would the normal use case be to merge all of them? The argument(s) to merge are resolved to commit-IDs. This means that the rules in gitrevisions are applied. In general, origin/ name resolves to one of the "remote

I begin to use git for software development. I have a project on github. This project also involves some user-settings stored in dedicated settings-files. On github the settings should be empty (like this) ### Settings: ## Your name $name = ""; ## Your email adress $email = ""; ## and so on However, I also have the project running on my computer (or server). My personal version of the project should have all settings filled out. I would like to have two branches for that. The personal branch should contain all my settings. The master branch should be the one where I develop the software and

I have following use case. I have a mainline branch. Created new branch(dev) from mainline . Did multiple commits(around 20) into dev branch and pushed into dev (remote) branch as well. Now I want to merge all these 20 commits into single commit and move this to mainline . How exactly I can do this? Thanks in Advance, Shantanu VonC That sounds like a git merge --squash git checkout mainline git merge --squash dev git commit Note that, as commented here , it is best to merge mainline in dev first and solve any conflict there, before merging back dev in mainline . 来源： https://stackoverflow.com

My main branch has some files that have different codes from the same file of development branch. The development branch is the one that has the correct version of these files but when I am trying to merge it to main branch(target); I am getting a message saying There was no changes to merge How can I resolve that problem so that the main branch has the correct version of those files? jessehouwing When merging files TFS doesn't just look at the differences between the two branches, but it also keeps track of whether you've ignored these changes in a previous merge attempt. When merging TFS

I have a TFS 2010 Team Project that I've just taken over. The branching hierarchy is Dev is a child of Test, Test is a child of Main e.g. Main ----Test --------Dev However at some point in the past someone has done a baseless merge between Dev and Main. this is causing a great deal of confusion as Developers are now accidentally merging code directly from Dev to Main. This is causing pain with unforeseen merge conflicts when code follows the correct process and is merged from Test to Main, as well as potentially creating a scenario where untested code is promoted to the Main branch. Is there

Is there an option like --author of git-commit for git-merge? We maintain a staging environment where some changes must be performed. Some limitations make us to use only one linux user to access staging environment. Anyway, we are a small team with cooperative initiative and we tell when doing commits, which one is the author using the --author git-commit option. However, some times we need to merge from other branches which result in a non-ff merge. This implies a commit is performed when doing this merge. Which would be the best way to specify the author manually for the merge commit in