Stack Overflow
Stack Overflow

Questions tagged [branch]

A "branch" is a term used in version control systems to represent an independent line of development. Depending on the system, a repository can contain one or more branches. Branches are merged when changes need to propagate from one branch into another.

A "branch" is a term used in version control systems to represent an independent line of development. Depending on the system, a repository can contain one or more branches. Branches are merged when changes need to propagate from one branch into another.

Source: Wikipedia Branch (Version Control)

Related tags:

5403 questions
3
votes
1 answer

creating a new clean branch in Git for a v2 rewrite

I'm getting ready to start version 2.0 of a library, a complete rewrite. I'll basically start from scratch, but I'd like to keep working within the same Git repository. I'm trying to figure out how to approach creating a clean new brach for the…
Hristo
  • 45,559
  • 65
  • 163
  • 230
3
votes
1 answer

How to prevent a file from automatically merging when switching branches in Mercurial?

Let's say I have two branches named default and newfeature. I have a file called readme.txt in both branches. I'm working on the newfeature branch and I make a change to readme.txt. If I run hg up default without committing the change, Mercurial…
Robert S.
  • 25,266
  • 14
  • 84
  • 116
3
votes
3 answers

With Git, how can I show the tree of commits that all share a common ancestor?

Suppose I have a 'master' branch, a branch for reviewed & approved changes for my team (call it 'stage'), and a bunch of feature branches all based on the stage branch. (The idea is to group changes into a common pull request from stage into…
Steve Hollasch
  • 2,011
  • 1
  • 20
  • 18
3
votes
2 answers

Migrating SVN (to Git) branches with white space in the names

I'm facing a common problem migrating SVN to Git, basically I have some branches (on SVN) named with white spaces. Is there a way to solve or workaround it? I've found some "solutions" but none of them worked for me. For tags with white spaces:…
Idemax
  • 2,712
  • 6
  • 33
  • 66
3
votes
1 answer

Should I delete unused branches?

I'm thinking about unused branched. When I create new module I create new branch and name it with pattern "[task_id]-[shortDescription]" - for example: "4389-surveys". When I finish work on this branch I merge it to master and the branch lies…
Kamil P
  • 782
  • 1
  • 12
  • 29
3
votes
1 answer

PhpStorm, open files depending on the git branch

When I work, I always have 2 to 6/7/... branches where I edit usually completely different files. These branches usually don't exist for more than a few days, 2 or 3 weeks at most. As I don't want to look for the files I modified or had opened last…
InsOp
  • 2,425
  • 3
  • 27
  • 42
3
votes
1 answer

How do I remove all remote git branches

I want to remove locally all branches that I can see with git branch -r. I've already removed all files from .git/refs/remote/*/ and appropriate records from .git/info/refs, but they are still there.
raacer
  • 5,302
  • 3
  • 27
  • 46
3
votes
4 answers

How do I make a branch from a SVN tag with Maven?

Suppose I have tagged the release version of our project under $SVNROOT/project/tags/1.0. Suppose now that I need to create a branch from that tag, mark it as being a SNAPSHOT, and update the scm configuration. I tried with the release:prepare goal…
lindelof
  • 34,556
  • 31
  • 99
  • 140
3
votes
1 answer

Git - 2 separate develop branches - cherrypicking or not?

I have 2 separate develop branches in Git, develop1 and develop2. These 2 branches have a common ancestor, commit C1 on master. These 2 branches contain 2 product releasecycles will will be joined in about 6 months (both merged into master). Before…
Bossk
  • 707
  • 8
  • 24
3
votes
2 answers

Subversion branching when trunk/branches buried in subtree

I've been tasked with work on an SVN repository organized as follows: REPO_ROOT |-AAA |-BBB |-DDD |-D1 |-D2 |-software |-branches |-tags |-trunk |-YYY |-ZZZ I'm working mostly on…
Daniel
  • 2,380
  • 29
  • 44
3
votes
2 answers

'Pinning' a specific version of a file in a git branch

In a git repository, lets say I have a file in my master branch, config.json, which contains some information about e.g. my hosting environment. master - config.json For the sake of argument, lets assume this file is read by my gulp-file and…
havardhu
  • 3,576
  • 2
  • 30
  • 42
3
votes
1 answer

Task per branch with perforce

i'm preparing a seminary about p4 and i'm trying to find the best way to use the "Task per branch" methodology, now i'm using the following steps: (all by CLI) Set my client to the root depot in order to create the new branches. View: //depot/...…
MrCatacroquer
  • 2,038
  • 3
  • 16
  • 21
3
votes
1 answer

Conditional Logic in django forms

I'm trying to build a conditional form where selecting one option will cause a new field to appear underneath, while selecting another option will display something else. Formstack has a good example…
Peter
  • 85
  • 3
  • 8
3
votes
2 answers

Merge from PROD to HEAD or HEAD to PROD?

We have two branches: 1. HEAD - the latest version (AKA Trunc) 2. PROD - the released version When you fix bugs in the released version, which of these do you do: Fix it in PROD, then merge to HEAD Fix it in HEAD, then merge to PROD The advantage…
ripper234
  • 222,824
  • 274
  • 634
  • 905
3
votes
5 answers

Git: how to merge modified files only

I have the following problem: We have a large product which is in master branch. Also we have other branches that have only few files, the files that are specific to this branch only. Each of those branches represent a plugin to the main product. So…
Eugene
  • 4,197
  • 7
  • 37
  • 54
1 2 3
…
99
100