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
1 answer

Sharing csproj files between solutions

I've been looking into this for quite a long time and still havent found any satisfying solutions. We have a few shared libraries (.csprojs) which also have dependencies on each other as well as 3rd party dlls. I want to have these shared projects…
jcfore21
  • 72
  • 6
-1
votes
2 answers

Create a Subversion branch from an already modified trunk working copy

There's a situation that I create a working copy from Subversion's trunk. I then go changing things. Onoly ffter some changes have been made, I decide I wanna stage the work and do multiple commits over it. But I don't want this work to be inside…
Hikari
  • 3,797
  • 12
  • 47
  • 77
-1
votes
1 answer

Best way to make current git history accessible to view for others

When I work with other people, I often like to take a look at what they've done so far or I would like to let them know what I've been doing. Let me note that in such a state, the code may be unusable in a way that a new feature disturbs something…
Lukas Juhrich
  • 395
  • 1
  • 4
  • 13
-1
votes
1 answer

How to protect VB.Net project settings when merging in TFS?

In a simplified version of my scenario, I am developing a VB.Net app deployed using ClickOnce, with a Live branch for production code, and a Dev branch for working in. I want to deploy each of these branches to a different location (live for…
McOz
  • 1
  • 3
-1
votes
2 answers

Git to mark a branch-specific commit and prevent from merging

I have two major branches for my project - master for the "production" version of the web app, and branch X for the "test" version of the app. I need to keep some code tweaks related to deployment settings, database configs, Google Web Analytic IDs…
alexandroid
  • 1,469
  • 2
  • 15
  • 32
-2
votes
2 answers

GUI for manual merging 2 branches on GIT

I have 2 branches on a project, both with plenty of changes since branching. Now I need to merge changes from one to other (and possibly into new branch, but it doesn't really matter - whatever is easier). I would like to do the merge manually in…
Juraj.Lorinc
  • 503
  • 6
  • 26
-2
votes
1 answer

How to merge a lot of branches to master at once, is there is any command in git?

I have forked someone else's branch in GitHub and he had more than 100 branches. Is there is any way to merge all branches at once to master so that I can view all files at once to master. Any help will be appreciated!
Amit Tiwari
  • 163
  • 2
  • 10
-2
votes
1 answer

Study- or research-paper on how to implement trunk-based/master-branch development?

Please could You share a study- or research-paper on how to implement “trunk-based”/master-branch development (as opposed to have long-lived sub branches) in a micro-service based environment ? Preferably a study giving business case ($$$)…
zombieboy
  • 116
  • 1
  • 10
-2
votes
1 answer

Branching solution

I'm working with visual studio and TFS and currently exploring the idea of branching and merging. To give a general overview of how I'm organizing one solution: MySolution - MyProject 1 MyProject1TestBranch - MyProject 2 - MyProject 3 I have…
Banjaxx
  • 624
  • 2
  • 18
  • 34
-2
votes
1 answer

Difficutly sorting changes between git branches, changing branches

I have 3 branches in a project that should've been all discretely separate from the beginning, but alas, I'm still learning git and they got muddled together about halfway through my work. Currently I can switch between master and my dev-1 branches.…
CDorr
  • 17
  • 1
-2
votes
2 answers

Git best practices for keeping files from 2 different environments

A question on how to practically use Git. I have code that's deployed onto 2 servers (1 for staging, 1 for production); it's the same code but for a couple of files (different paths in config files). NOTE -- I generally commit/push from a dev…
user3341592
  • 1,419
  • 1
  • 17
  • 36
-2
votes
1 answer

How to fix git when there are two origin branches with same name?

First I tried to undo a pull (don't ask me why), by moving my origin/develop branch to a specific commit: git reset --hard # trying to undo the pull (please don't ask why) git branch -f origin/develop HEAD Looks like git created a…
fernacolo
  • 7,012
  • 5
  • 40
  • 61
-2
votes
1 answer

Buildfile with trunk/branch or separate

The issue that I am trying to figure out is whether it is best to keep the buildfile together with the source code, i.e. trunk and branches, or in some separate location (obviously still under SCM). The question: (to keep in mind while reading the…
Slav
  • 27,057
  • 11
  • 80
  • 104
-2
votes
1 answer

git branch off of another branch

Hi I have two branches in parallel 'dev' and 'prod' I would like to add another local branch to the local dev branch called 'issue22' (GitPro refers to this as a topic branch - others call it a feature branch). So at the terminal I created my…
user1709076
  • 2,538
  • 9
  • 38
  • 59
-3
votes
1 answer

Prevent Git/Github from removing some of code

I work on a robotics team that uses code from the robotics competition leaders, but with our own modification made to the code. They pushed out an update to their code, but when I work on merging it into our code, GitHub wants to remove our…
BarrowWight
  • 181
  • 2
  • 12
1 2 3
…
99
100