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
-1
votes
2 answers

Trying to add my branch to the master branch

Imaging you have made a branch from main and you add some features. The same time, your coworker has made a branch too and is working on it. If he merges his work to the master branch, how can you also merge yours to the master without deleting his…
Ryan
  • 3
  • 1
-1
votes
1 answer

From master branch i created new branch called release1

From master branch i created new branch called release1. I switched to release1 branch and added one file then again i switched to master branch.Here without merging branch,the file which is in release1 branch is reflecting in master branch why?
jay
  • 1
  • 1
-1
votes
1 answer

Commits from branch master appear in other branch - GitHub

I am analyzing commits from project apache/mina-sshd but I am running to a problem: All commits in the branch 0.9.x from project mina-sshd (except for the first 3 commits) belongs to branch master but still be shown in branch 0.9.x. Can anyone…
Zui Vu
  • 1
-1
votes
1 answer

How to merge unstaging of files into local master branch?

I am working on a project where I use the master branch to only contain the various "release" worthy states (following the model here: https://nvie.com/posts/a-successful-git-branching-model/). I have created a new branch for the last changes before…
JonasKaminski
  • 11
  • 3
-1
votes
1 answer

What is the right process in using Git Flow?

I am using Git Flow, "A successful Git branching model": https://nvie.com/posts/a-successful-git-branching-model/ but I do not fully understand it, so I am asking your help. In our project we are using gitlab and there are 2 branches from the…
user13094449
-1
votes
1 answer

How do merge two branches with related changes into master?

In GIT I have 2 BRANCHES and a MASTER. BRANCH1 is checked out from master and it have some commits to be merged with master and merging of BRANCH1 will take some time because of some testing reasons. In that time I've to work on another Branch which…
Magaesh
  • 488
  • 6
  • 19
-1
votes
2 answers

Git and Github with branches

I seem to have created a mess. In my local repo, I have the following structure: I have a clean set of code in my master. And to do some new experiments, I forked it to rsadev. I am planning to go back to Master and fork again to another branch…
user3259937
  • 567
  • 7
  • 16
-1
votes
2 answers

Project permission on Bitbucket

I am trying to put project level permission on my project for some git users on Bitbucket repository as.. also for the repository in the project i have used branch permissions as According to these permission user "Rahul" should not be able to…
Abhishek Pansotra
  • 947
  • 2
  • 13
  • 17
-1
votes
1 answer

Reparent in TFS vs recreating the branch

We have the following branch structure Dev > 2017 Where all changes go from Dev to 2017 Release, we would like to create the 2018 release branch so we branch off 2017 Dev > 2017 > 2018 We would like to reparent Dev to 2018 Dev > 2018 In the past we…
youngprog
  • 19
  • 3
-1
votes
1 answer

Mercurial - new branch from upstream commit

I've got a series of commits in default branch of my fork waiting for review and merge upstream. Now I need to fill a separate bug fix and I want to return to the original branch point between my repo and remote. I can look through the changelog…
anatoly techtonik
  • 19,847
  • 9
  • 124
  • 140
-1
votes
3 answers

Git with same app but different frontend

My team is developing a project in Laravel and recently we had to make a new branch because of different front end. Is it possible somehow to apply the changes from one branch to another and vice versa but so that the front end is untouched. This…
lewis4u
  • 14,256
  • 18
  • 107
  • 148
-1
votes
1 answer

How to manage Parent-Child Hierarchy in Git

I want to get the idea on how to manage the Parent-Child Hierarchy in git. Let's say I have a master branch where code will be updated once a week. I have made a new branch say MainDev for development. When the team works, they create branches on…
baig772
  • 3,404
  • 11
  • 48
  • 93
-1
votes
1 answer

How to create a new branch from existing application code in TortoiseSVN

We've been working on a version of an application that was originally checked out from a Tortoise SVN trunk. Unfortunately though, instead of creating a new branch first from that trunk, then committing and updating our changes to that new branch,…
user2980343
  • 79
  • 1
  • 9
-1
votes
1 answer

TFS branch structure to use: flat or hierarchic

I'm wave between using an hierarchic or a flat branch structure. Hierarchic structure is more logical and is considered the standard. The cons of hierarchic structure is that I can merge 1.4 DEV2 to 1.5 without touching the 1.4 only with baseless…
mmm
  • 61
  • 1
  • 9
-1
votes
1 answer

TortoiseSVN: How to propagate code from current branch to next branch during commit

In my project, we are restructuring our SVN repository. I want to implement a feature where we have 2 branches, current release is going on B1 and next upcoming release is B2. Some developer are working on B1 and some on B2. I want to know if…
AmitG
  • 519
  • 6
  • 19
1 2 3
…
99
100