Questions tagged [branching-and-merging]

1

votes
2

answer
22

Views

Git branching strategy issue

Currently we are using a GitFlow approach to our branching strategy. However we came across the following scenario. We created a release branch. There were a couple of bugs that needed a fix on the release branch. In the meantime since the development continued on the develop branch there were addit...
igalbenardete
1

votes
2

answer
34

Views

How do I catch a git branch up to master when it is both ahead and behind?

I've created a branch called shift-development from master and did some work in the branch, putting it ahead of master by 40+ commits. I also made a small change to master, putting shift-development behind master by 1 commit. How do I catch shift-development up to master? i.e. bring the changes from...
NickBourque
1

votes
2

answer
212

Views

TFS Unmerged Changes

I use a simple branching strategy where I have a trunk. i branch from that trunk into multiple development branches. Once dev is done I merge the dev branch back into main. I'm looking for a way to produce an automated report that would tell me which branches have changes that have not yet been me...
user263097
1

votes
1

answer
39

Views

How are branches used in software industry for a big team size?

I am using sourcetree for code repository in bitbucket. I want to understand how does other team uses sourcetree and repo branching. Is it done branch per dev or multiple devs per branch, and if so does any conflict occur in case multiple people from their local repo push to the remote repo? We are...
Nitish Patra
1

votes
2

answer
41

Views

How to delete the effect of a commit via PR?

TL;DR: I need to delete a commit from master, which must be done with a pull request. How is this done? There is a commit on master which needs to be removed because the changes it provides are bad. I cannot push a commit directly to master because of the branch policy. I have created a branch from...
Matt W
1

votes
0

answer
28

Views

Mercurial: Tracking configuration files, but in a different branch

In my current project I have followed the usual advice for configuration files: Commit configuration files as templates, then copy them to another location so that configuration settings don't end up in the change history. However, it is nice to be able to track the history of configuration files as...
alexis
1

votes
0

answer
30

Views

How to start work on a new feature in Git that depends on another in progress feature

My development team has recently transitioned to Git from TFVC, and are following the GitHub Flow branching strategy. However, one developer believes they have found a flaw that makes Git 'not suitable for real-world usage'. The developer is going to do a pull request to bring a feature to master, b...
Phaneuf
1

votes
1

answer
54

Views

Mercurial: Import another repository as new branch

Scenario: I have two Mercurial repositories, let's call them 'Original' and 'NewProduct'. Original has 1072 revisions of history. NewProduct was created as follows: Update Original to tip (r1072) Copy working directory to a new folder Create repository NewProduct in that folder Add all files and per...
Aki Kanerva
1

votes
0

answer
29

Views

List all merged branches into current branch

I want to list out all branches that are merged into the current branch. I used git branch --merged command to list out branch names. But it is listing all previous branches that I haven't merged into the current branches also. Eg. master | ------------ | | | dev dev1 dev2 | release | ---...
Azima
1

votes
0

answer
42

Views

Git: Merge a really old branch into a newer one with many commits and conflicts

I have some code which was cloned from an active Github repo, modified, and then made available (still in source-code format) separately with a hardware product. Since then, the source repo has seen 7,000+ commits, and I'd like to see if I can apply those bug fixes and feature additions to the forke...
Jemenake
1

votes
0

answer
97

Views

Git staging branch is n commits behind master after pull request

For this project, the base branch is master branch and there is a staging branch that is branched off master. All the issue branches are branched off staging and merged to staging. Then ultimately staging branch will be merged to master. I think I screwed up at some point and now when I merge stagin...
PowerLove
1

votes
1

answer
224

Views

Can I automate a TFS reverse integration merge

We have multiple stand-alone hybrid dev/test teams, each with their own environments where code is written and tested as a complete unit. When an environment is in a tested deployable state, they merge from their main branch to an Integration branch. We also have a true test environment where we c...
MitchelWB
1

votes
2

answer
54

Views

Creating TFS branches where they do not already exist

I have On premise TFS2017 with Update 1 (15.112.26307.0). Within my Project collection, I have a project that we shall call Project1; it is represented in source control as '$/Project1'. This project has no branches, the solution file is in the root ('$/Project1/Project1.sln') and all of the source...
Martin Robins
1

votes
1

answer
29

Views

git: How to merge an older state if a newer state has already been merged?

We had a branch (let's say branch A) with some modifications we wanted to merge to master, and some modifications we didn't want to merge yet, but wanted to keep for later use. We didn't rebase/split the commits, and simply went for a manual modification of the code. So we created a new branch (bran...
FBB
1

votes
2

answer
242

Views

Git Merge, Ignoring Changes to Certain Files (Ours vs Theirs)

Setup A company is doing some work for us, forked off of of master, and has been opening pull requests against a feature branch that is dedicated to this effort. We don't (currently) have a transpiler, and when I asked the company to take out any ES6+ notations from front-end, they also changed not...
astangelo
1

votes
1

answer
18

Views

Merge a fix from main to branch or vice versa?

In version control, we have a main branch and recently created a release branch. We were dicussing, where to fix an issue and where to merge it (fix in main and forward integrate to release or fix in release and reverse integrate to main). Microsoft states in their 'Branching and Merging Primer' (h...
Christian
1

votes
1

answer
42

Views

SVN 1.8 best practice - Deleting completed branches

All, is it still recommended to delete completed branches in subversion 1.8? The previous SO questions refer to version 1.7. In 1.8 there's no --reintegrate anymore.
chris
1

votes
0

answer
10

Views

What do you do when you need to modify a file outside of the TFS branch?

In TFS, a branch is either a file or a folder. Let's assume I have a folder branched. What if during development, I realize I need to modify a file that isn't in the current branche's scope? (I.e., in a folder higher in the file hierarchy or a sibling folder.) Example situation: I branch the folder...
Protector one
1

votes
1

answer
97

Views

Force rebase/merge master to feature branch before pull request

We would like to enforce a policy in our git repositories so that master must be merged/rebased (let's ignore merge vs rebase for now) to feature branches before creating pull requests. The reason we'd like to have this policy is to force developers to consider functionality added in other feature b...
ubi
1

votes
0

answer
48

Views

Git Flow: best approach for a hotfix for an older version being merged after a new release

When Vincent Driessen explains Git Flow he says a hotfix branch must be merged back into the master and develop branches, with the exception that if a release branch exists, the hotfix gets merged back into the release branch instead of the develop branch. This scenario considers the release is fini...
Flávio Araki
1

votes
0

answer
22

Views

how to restrict master branch from commits by organisation members also?

I am trying to restrict master from any push. I had followed enter link description here but even after that my team members are able to push the code.I read that the organisation will have access to push .But I want to restrict that as well and keep the push access to only 1 or 2 people. How do I a...
yacky
1

votes
1

answer
29

Views

TFS - Make 2 Existing Folders related branches

I am working with TFS 2012 and wondering if I can accomplish something easily. I have two folders with several sub folders ... in a previous SC they were branches of each other. Is there a way in TFS to make them have a 'relationship'? I've used the 'Convert to Branch' on both. When I try to 'M...
dblwizard
1

votes
1

answer
26

Views

Amend a Git Commit from which another branch spawns

Let's say I have commit A, on branch mainline, which is currently not pushed (e.g., because it's being code-reviewed). In the meantime, I want to start working on a new feature B, based on commit A, so I create another branch and start working on it. This is the current situation: --- A \ -- B In t...
Luigi D.
1

votes
1

answer
598

Views

hg diff -g shows different output between a merge (pre-commit) and the change log (post-commit)

I am using branches in our mercurial repository and have noticed renames done in separate branches are not shown pre-commit after merging to the default branch. However after a commit when you issue the hg diff -g command it shows the rename correctly. The following snippet shows what I mean. A new...
Christian Maslen
1

votes
1

answer
899

Views

Migrating a branching strategy from ClearCase to TFS 2010

I am in an 'internal' IT shop and we currently use ClearCase for version management. Our branching strategy is common for this with the main branch being reserved for live code and branching off main for project and hotfix type activities. Each project (and they overlap often) has a branch off mai...
Alan Mullett
1

votes
1

answer
843

Views

merging changes in tfs

We have a main development branch, which was branched for a release 1.0. We also have branched the main development branch to do some parallel development. A hot fix was done in the release 1.0 branch and merged up to the main branch. Now parallel development is complete. Everything has been che...
Jeremy
1

votes
1

answer
161

Views

Git Pushing from a local branch to a remote tracking branch

I have a master branch and branched out from it to a build branch. I cloned this repository to a different machine. I created a branch my_build to track the remote build branch. Now i have few commits made in my_build branch. I want to push these changes to Remote build branch. I tried pulling fro...
vinder
1

votes
2

answer
491

Views

Subversion branching without having canonical directory structure

I have a subversion repository, and I would like to create a branch, but the repository does not have the canonical directory structure of /trunk, /branches and /tags - it just has everything that should be in /trunk, in the root folder. Am I screwed, or is there some way to correct the directory st...
HighCommander4
1

votes
1

answer
56

Views

Merging problems: Which revision should I choose to merge from?

I have previously only had simple scenarios where I have branched from trunk, made some changes and then merged the changes into trunk. But this time it has gotten somewhat more complicated as the branch has had to merge in new stuff from trunk along the way, and now I do not know from which revisio...
oligofren
1

votes
1

answer
314

Views

How to solve merge issues in large Subversion repository?

Before I explain the core issue, let me say that I'm actually quite interested in migrating our source control from Subversion to Git/Mercurial if it really is a better solution for our issues, but I'm really looking for the best solution without causing a lot of unnecessary stress on the team. (In...
Will WM
1

votes
1

answer
2.9k

Views

Git Rebase or SVN Reintegrate for Feature Branches?

We are currently using SVN, but considering moving to Git to support our new workflow, which relies heavily on rebase. We're considering a development workflow where each individual feature is developed on a separate branch, then merged into trunk/master when it's ready for release. The branch will...
Travis
1

votes
1

answer
87

Views

Got warning with git branch and merge in xcode4

I tried git integrated with xcode 4, but got problem on merge a branch back to master. When I develop new feature I create a new branch and add many new lib and files, the problem came when I want to merge this branch back to master. From my understanding I have to switch back to master and then mer...
sarunw
1

votes
1

answer
152

Views

Source control branching schemes for internal applications

I'm accustomed to a source control branching scheme where branches are created for each major version of a product. I may be overlooking some latent benefits of this model, but I think the main benefit is that this allows releases to be patched out-of-band. It seems like this model is overly compli...
Eric
1

votes
1

answer
103

Views

Choosing best branching model for common framework based different applications development

I was reading many articles about version control systems like SVN, Git and various branching models (feature based, release based and others) but none of them did not seem to fit our project requirements. We (team) are going to develop a framework, which will be used as core for different applicat...
user1123503
1

votes
1

answer
52

Views

What are all the rules we should follow to reduce merging issues?

After we migrated to Clearcase UCM , we have created stream for each sub team. Often we are facing merging issue as people tend to work with old version without rebase. [ As rebase takes time] Some times same files are being changed by 2 person in the same stream as they do unreserved checkout. Is t...
Samselvaprabu
1

votes
2

answer
197

Views

git multiple remotes: what to do with ignored/private files

My problem/issue We are working on an opensource project which we have hosted on github. The project is written in Django and so we have our settings in a settings.py file. We have it open source not because we are too cheap for a subscription, but because we intentionally want it to be open source....
Allard Stijnman
1

votes
1

answer
216

Views

Is there a way to filter Subversion's command line merge by username

I am using svn merge urlToSomeBranch from my working subversion copy of a freshly pulled trunk. Using the command above I can cherry pick what to merge by file or revision. But what I would really like to do it only work on merging the changes that I made or those of another team member if needed....
Vinny
1

votes
1

answer
745

Views

Git branching strategy, how to push to various environments without issues

Looking for advice on how to setup git to support multiple developers working on features, and how we push to our various environments like dev, qa and uat. I was thinking of something like this: dev_branch - new features get a feature branch i.e. dev_branch_feature_x - once feature is completed, it...
loyalflow
1

votes
2

answer
497

Views

TFS rebranch-ing?

In our TFS(2007), we've got this (bad) hierarchy : $main |_ $V1 |_ $V2 Ok ... it's a bad move from us. Now, we'd like to have that : $main |_ $V1 |_ $V2 Is there a way to un-branch $V2 from $V1, and branch it to $main ?
manatlan
1

votes
2

answer
90

Views

Can I checkout & commit to several Mercurial hg branches at once?

I've forked a project from the internet, and I want to write some new features. I want to write several orthogonal features at the same time, (eg. debug helpers, new feature X, new feature Y), and have the code for all of them in my current directory, but when I commit, I want to be able to say 'the...
ACyclic

View additional questions