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
3 answers

Git Clone Branch, Edit, then Merge with Master

I'm very nooby to using git branches with other users so I was hoping for some help regarding a project. My project has 3 branches(master, auth, and dev1). I am the user of the master branch and I recently cloned the auth branch to a local folder…
pjmanning
  • 1,241
  • 1
  • 20
  • 48
0
votes
1 answer

svn merge from a moved branch to a new branch

With svn respo, I created a branch A (revision r0) working with my parter John. I made some changes revision r1, John committed some changes revision r2. Then I find I don’t have enough time for testing r1 changes, so I rollback which –c –r1 . John…
user1700152
  • 1
  • 1
0
votes
1 answer

TFS 2010 cloaked database flag

In a TFS 2010 collection database, where is the database flag the identifies if a folder is cloaked within TFS?
Jason
  • 87
  • 1
  • 9
0
votes
1 answer

pushing branch after merging unrelated repositories

I have merged two repositories together with the mqextension, giving me a repository that looks like this: .. [a] --- [b] --- [c] --- [d]<- default branch / [x] --- [y] <- feature branch The problem is that when I try to…
metrix
  • 1,486
  • 2
  • 11
  • 19
0
votes
1 answer

svn - review updates to "branch updated" files after merge?

I'm working on a feature branch in SVN and I'm trying to frequently bring in changes from the trunk so I don't get too out-of-date. I've been using the command: svn merge ^/parent/branch/path How do I get a clear list of the files that are…
nonot1
  • 2,788
  • 4
  • 25
  • 41
0
votes
1 answer

A mess after renaming TFS 2010 branch, and making a new one in the same name

We have the following source control structure in our development environment: a Main branch, which is the root of all branches, and a Development branch, which is the son of the Main. Now, I recently did a "Rename" on the Main branch, and now it's…
max12345
  • 29
  • 2
  • 9
0
votes
1 answer

merging branch on clone into origin

Using smart git, I'm trying to merge all the commits from 'admin_aps' into the origin and making a mess of it. Does 'Released_V1' act as a bridge between the two? I can't access Released_V1 from the original repository which i'm thinking in the…
JPickup
  • 388
  • 3
  • 17
0
votes
3 answers

Migration strategy of source code from one project to another using GIT

I like to reuse some code of a GIT maintained project for another project. The working code is a good kickstart to the new project, despite most of it would come obsolete for the new needs. So the question is what would be the best practice for…
dronus
  • 10,774
  • 8
  • 54
  • 80
0
votes
1 answer

Can I create a branch in mercurial that undoes previous merges?

I would like to go back to a working revision, and pull EVERY changeset I've made since that revision, into a new branch. Basically, I have merged from the main branch a few times, and would like to reverse those out. Is this possible? Are there any…
johannestaas
  • 1,175
  • 1
  • 9
  • 15
0
votes
1 answer

Mercurial: Pulling in others merges + branching

I'm still very new to Mercurial so please let me know what I'm doing wrong. We have an hg repo for each of our developers. I'm working on a new feature in branch x. Since then, others have made critical changes to the project, which I have pulled…
DOOManiac
  • 6,066
  • 8
  • 44
  • 67
0
votes
2 answers

git multiple-projects branching

In my case, The super project is big enough so it consists of multiple artifacts. Let's say project A,B,C,D,E. They are different git projects. Now we need to work on two different releases, then it comes down to the problem how do we wanna do…
Shengjie
  • 12,336
  • 29
  • 98
  • 139
0
votes
1 answer

Git Vincent Driessen model testing server

I am using http://nvie.com/posts/a-successful-git-branching-model/ As far as I understand, main repo in this model should be a bare repo. In the blog it is stated that "The repository setup that we use and that works well with this branching…
Sijo Kurian
  • 476
  • 6
  • 15
0
votes
1 answer

How to update a branch via master using Git

I am a complete newbie when it comes to Git and am struggling to understand how handle merges on branches. Basically I have branchA which has some changes, master (which I'm trying to use as analog to "trunk" in SVN) and branchB. What I am trying to…
user1464105
  • 1
0
votes
2 answers

Merged branch but when modifying it, master gets modified

A simple/newbie question. I create a branch from the master branch (say "testing"), tried some stuff, and merged it back. Now when I modify the "testing" branch, the local changes are also made on the master branch. Should I then delete a branch…
rocarvaj
  • 546
  • 4
  • 19
0
votes
1 answer

SVN - Merge branch changes in the Trunk

we are working on 2 concurrent releases, one is the branch and other is trunk. and every change that goes to branch must be merged in trunk. this takes lot of time if we are working on a big functionality. thus I want to automate this process i.e.…
Hell Boy
  • 899
  • 5
  • 12
  • 22
1 2 3
…
99 100