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.

1377 questions
-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
  • 455
  • 7
  • 22
-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
  • 41
  • 5
-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
  • 104
  • 1
  • 8
-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
  • 594
  • 2
  • 14
  • 33
-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,037
  • 11
  • 29
-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
  • 5,982
  • 4
  • 35
  • 57
-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
  • 25,168
  • 9
  • 69
  • 95
-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
  • 162
  • 2
  • 11
-3
votes
1 answer

Branching / merging strategy for TFS 2015 with Git repository for multi-team efforts?

We are planning to use TFS 2015 with Git repository and need ideas for branching and merging strategy? We have one team working on new enhancements and another team working on defects fixes (O&M). How do merge these efforts and keep things in sync?
Chaka
  • 1,627
  • 10
  • 31
  • 56
-3
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,066
  • 7
  • 31
  • 50
-5
votes
1 answer

Subversion: New Project requirements

I am new to Subversion. I am working in ClearCase from past few years. We got a new Project, where our Client needs his work to be done on Subversion, as it is a Open source SW. As a newbie and CM for our Project, I would like to know: What are…
Sukuman
  • 1
1 2 3
…
91
92