Stack Overflow
Stack Overflow

Questions tagged [branching-and-merging]

In version control, branches represent parallel lines of development. Merging is the action that integrates changes made in different branches.

Modern version control systems (VCS) handle branching and merging by keeping track of incremental differences in data. When a user creates a branch of a project and begins making edits to that branch, only the edits made are tracked (as opposed to the user editing a true copy of the project). When the user have finished making changes to the branch, these edits are applied in order onto the destination of the merge, branches to be made and merged at any time.

Conflicts may arise if multiple changes are made to the same data in a project. Modern VCSs will alert the user and ask them to resolve the merge conflicts (choose which changes should be kept) before completing the merge.

1503 questions
0
votes
2 answers

Git three-way merge with conflict noob issue reading the book

I'm just started learning git version control and I'm facing this problem. Given the following branch structure (taken from the free book): Let's assume that C4/C5 commits changed the same part of index.html file. git checkout master git merge…
gremo
  • 47,186
  • 75
  • 257
  • 421
0
votes
0 answers

Fork git repo into a directory of another repo?

Possible Duplicate: How do you merge two git repositories? I have an existing git repository A. For another project, project B, my colleague has gone ahead and created a new git repository. We've added a bunch of code to this repository so…
Doug T.
  • 64,223
  • 27
  • 138
  • 202
0
votes
1 answer

TFS Branching Strategy where a release is delayed and development continues.

I have a moral delema, within my company we have our entire product suite in the main branch and projects will branch off the main (trunk) branch. I have a problem in that a sprint (there long 8 weeks) that is to be delivered has been delayed and…
Joshy
  • 657
  • 8
  • 20
0
votes
1 answer

TFS2008 Bad Branch Created

I've created a branch with TFS2008: Over a folder named Main, I've created a branch called Dev, and all works fine, in the Dev folder there's all code from Main. But when I've started to work with Dev folder I've seen a child folder called Main, and…
Marc
  • 1,359
  • 1
  • 15
  • 39
0
votes
1 answer

Is this a correct or incorrect action given this branching model?

I'm using Mercurial but I'm using the following as my branching model: I have a feature that I'm working on, so it's in it's own feature branch. However, I have some smaller items I've changed in the development branch that I'd like to use while…
Lester Peabody
  • 1,868
  • 3
  • 20
  • 42
0
votes
3 answers

Branch that includes non consecutive revisions

Suppose I have a revision history with no branching like this: 1 2 3 4 Now I want to create a new branch in my repository with revision 1 and 3, but not revision 2 or 4. There are no conflicting updates in revisions 2/3. Is there a way to do…
just.another.programmer
  • 8,579
  • 8
  • 51
  • 90
0
votes
1 answer

Git branch and local changes

Lets say I do a git checkout -b my_new_branch. Making some changes to my local files and after this I add all files with git add. and commit it and push. After this i realize that my branch is messed up and I want to delete it. So Im going back to…
Denny Mueller
  • 3,505
  • 5
  • 36
  • 67
0
votes
2 answers

Source Code Structure for Multiple Projects

Background: 3-5 programmers working with TFS. We support legacy apps as well as build new apps. I am implementing elements of continuous delivery and I want to have a good structure to start with. At present there is very little interdependency…
kingdango
  • 3,979
  • 2
  • 26
  • 43
0
votes
1 answer

How to rebase a svn fetched branch onto the master on Git?

I created a git repository from an existing SVN repo. In the SVN structure, I have the trunk and one branch (say, branch_01). The trunk is at the Revision 8, and the branch code, despite the changes, is updated until revision 4. After I fetched the…
Carlos Melo
  • 3,052
  • 3
  • 37
  • 45
0
votes
1 answer

Keeping track of changes in Dev Branch

I recently started taking an interest in using a branching model similar to Vincent Driessens Git branching model. We have multiple developers working on the same project so using different branches for different features is a big plus for us. The…
Deruijter
  • 2,077
  • 16
  • 27
0
votes
0 answers

How to set up TFS to cater multiple projects to multiple clients

We are planning to move to TFS 2012 and need some inputs from experienced people out there. What we have at work is around 30-40 different web application. Lets say we have an application A And Clients C1 C2 C3 Each client have their own…
Vishal Patel
  • 130
  • 1
  • 2
  • 10
0
votes
1 answer

Best methods to merge 2 Silverlight solutions?

I have two branches of a single Silverlight 5 solution. They are both built off of the same base project. I will be merging one into the other. Some files can be simply copied over, while others will need to merged line by line at the code level.…
aeternus828
  • 67
  • 1
  • 9
0
votes
1 answer

File version control vs revision control

I used SVN + GIT but still find it's not quite satisfied as they do not use file-level version control. Anybody can tell me why all types of version controls software out there does not support tracking version for invidual files ? Basically what i…
thienhaflash
  • 79
  • 1
  • 9
0
votes
2 answers

Is there some way to fake merge tracking in Subversion 1.4?

I'm interacting with a 3rd party Subversion repository that is still running version 1.4 and the likelihood of getting them to upgrade is close to nil. So, of course, my work with this repository is some of the most merge-heavy work I've ever done…
abeger
  • 6,766
  • 7
  • 41
  • 58
0
votes
1 answer

How can I find the most recent changeset in default to get merged into (other branch)?

It might be best to draw this out: default -----A-----o-----o----> \ Branch_A -----o-----o-----> \ Branch_B -----o-----o-----o----> \ Master …
moswald
  • 11,491
  • 7
  • 52
  • 78
1 2 3
…
99 100