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

How do I reintegrate a feature branch with broken merge history in SVN?

I have a long-lived feature development branch, let's call it dev-foo. The problem is that when I try to merge it into release-1, I get all kinds of horrible tree-conflicts and source conflicts that don't make any sense. I've re-integrated them into…
Bryce Schober
  • 130
  • 10
0
votes
2 answers

CVS Branching + Binary Files

I'm using CVS through the eclipse plugin. I have a .fla and a .swf file which I have committed in CVS. I created a new branch and made changes in the .fla and swf files and committed them on the new branch. I want to merge the new branch with it's…
Varun Achar
  • 14,781
  • 7
  • 57
  • 74
0
votes
1 answer

Cascaded Branching in TFS or : How to Branch into a Branch?

In order to make referenced assemblies available to the TFSBUILD process, we have set up a separate team project for those. We branch the assemblies into each team project with a solution that requires them (in the following referred to as target).…
Sebastian Edelmeier
  • 4,095
  • 3
  • 39
  • 60
-1
votes
1 answer

GitHub branching strategy for "servers" and "releases"

I am trying to wrap my head around creating a practical strategy for GitHub branches and deployments to multiple servers using GitHub Actions. I have the following four servers: Dev server QA server Staging server Production server Note that,…
Ben
  • 15,938
  • 19
  • 92
  • 138
-1
votes
1 answer

How to restrict merging options on github

By default github provides three ways to merge a PR to a branch: Merge Commit Squash and Merge Rebase and Merge Can we add some branch rule or is there any way we can restrict them and allow only one or two options for any given branch.
Hardik3296
  • 336
  • 2
  • 14
-1
votes
2 answers

git fetching and merging when origin and local and very different

I am working with a team project. There is this branch "current_feature" made by other developer. So I did git fetch origin current_feature and then git checkout current_feature. With that I got both the remote and local "current_feature" in the…
KansaiRobot
  • 7,564
  • 11
  • 71
  • 150
-1
votes
2 answers

How to "delete" history in Git feature branch

In a feature branch (cloned from master) we added some files and than deleted them. The same files where added to the master branch. When we now try to merge back the feature to the master the files in the master get deleted (my understanding is,…
golfo
  • 85
  • 5
-1
votes
1 answer

Draft merge request in GitLab is two commits behind--click "Mark as ready", or pull/rebase first?

I need your help to determine the correct order events I should follow before I perform a specific type of merge in GitLab. I have a "Draft" merge request which has the prefix "Draft:" in its title, but has been approved by all its required code…
ShieldOfSalvation
  • 1,297
  • 16
  • 32
-1
votes
1 answer

git copy new changes added to older branch to latest work-in branch

I have two git branches, main the latest work-in branch and prod-2022-08 (older) as backup of what was deployed on production last month. In case if I need to provide a hot fix on production, I'll do the changes in prod-2022-08 branch and deploy…
Ali Shahzad
  • 5,163
  • 7
  • 36
  • 64
-1
votes
1 answer

Branching and release strategy - A best option to bring changes between develop to release branch

We are redefining the way we move commits from dev branch to prod branch. We are mostly following Kanban based approach where stories comes in develop it, move to QA, stays at QA and then moves to preprod when it was tagged for release and finally…
kbvishnu
  • 14,760
  • 19
  • 71
  • 101
-1
votes
1 answer

Push feature branch that was created from master to develop

We are in the starting stage of setting up dev-ops in our organization. We have 2 branches called 'master' and 'develop' and both the branches are empty with folder structure. Our developers created 'feature' branch from 'master' branch and…
Malaiselvan
  • 1,153
  • 1
  • 16
  • 42
-1
votes
1 answer

GIT downloaded dev and branched to feature

I have one local dev branch coming from the origin master. I created a feature branch off of the local dev. Did some work and pushed the feature up-stream back to origin. It now appears on the server branches. However, now dev has had changes by…
Yogi Bear
  • 943
  • 2
  • 16
  • 32
-1
votes
2 answers

Do we have to merge branches separately in VS Code and in GitHub?

I am working on my first major project. I made a new branch (left-nav) using GitHub and worked on it in VS Code. As my work is completed in that particular branch (left-nav) I merged it to the master branch using GitHub. But after merging…
Meet Bhalodiya
  • 630
  • 7
  • 25
-1
votes
2 answers

How to create a branch from code available on GitHub, worked on SVN before

I am new to Git and it's so confusing to me :(. I previously worked with SVN before and Git making it so tricky for me. The master code is available on GitHub. I need to create a branch and update the code for some bugs. I searched on web and…
Jyo the Whiff
  • 829
  • 9
  • 23
-1
votes
1 answer

Branching Strategy GIT

We have doing feature-based development and once the PR is approved it merged back to master. When the master is stable in terms of features to go live we make a release branch of it. Any release specific change will again merge back to master which…
Parag Diwan
  • 3,007
  • 2
  • 19
  • 37
1 2 3
…
99 100