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
2 answers

How to mark "release" commits in Git?

I am editing the master branch in a git repo. Time-to-time I test a commit and find that it works well. Then I may want to mark the last of such commits as release. It can be done with branching, but this way I need to switch branches, to merge, to…
porton
  • 5,214
  • 11
  • 47
  • 95
3
votes
0 answers

Commit same changes for all the branches?

Maybe this is a general question but I have not found any clear answer. I was wondering whether it is possible to perform a change in some file that is available for several branches and push/commit this change throughtout all or several of the…
Adrián Arroyo Perez
  • 375
  • 5
  • 20
3
votes
0 answers

Django migration between branches releases

We are to start branching our master code in the first stable version, and the company has to maintain 2 feature releases. To manage the migrations we use the django migration, but what we don't know is how to load with the hotfix scripts that we…
Alan Grosz
  • 1,175
  • 10
  • 15
3
votes
0 answers

Git log format with branches but without tags?

I'd like to show git log with all branch names but without tags (since in my repo there is a lot of them which obstruct the view) I am using the following formatting: git log --all --decorate --oneline --color --graph --pretty=format:'%Cred%h%Creset…
Patryk
  • 22,602
  • 44
  • 128
  • 244
3
votes
2 answers

In TortoiseGit, what is the equivalent of git branch -d (without the --force option)?

How to delete a Git branch with TortoiseGit has been partially answered here. However it doesn't cover the --force option. How can I use TortoiseGit's delete branch feature without the --force option?
Fabien Bouleau
  • 464
  • 3
  • 11
3
votes
1 answer

Deleting branches -> safe to edit files in .git/refs/heads?

The custom Git tooling that our team uses creates a branch for each new feature/bug that is worked on. Often times when the change is nearing completion, the remote branch will be altered via another tool, leaving the local copy of the branch…
Jonathan.Brink
  • 23,757
  • 20
  • 73
  • 115
3
votes
1 answer

What are the branches called [1] in GitLab?

I have noticed GitLab automatically creates branches called [1] in the network view. What causes their creation, and how can I get rid of them?
Colin Strong
  • 118
  • 1
  • 9
3
votes
3 answers

x86 assembly instruction execution count

Hello everyone I have a code and I want to find the number of times each assembly line executed. I dont care whether through profiling or emulation, yet I want high precision results. I came across a forum once that gave some scripting code to do…
Syntax_Error
  • 5,964
  • 15
  • 53
  • 73
3
votes
1 answer

Branching Strategy - Maintaining Multiple Releases

For years we've been using TFS (TFVC) as our version control system. We will probably migrate to git anyway, but I am trying to figure out 1) Is there a more sensible branching strategy/model than the one we're currently using, specifically for…
pinkfloydhomer
  • 873
  • 3
  • 9
  • 16
3
votes
2 answers

Etckeeper + git and remote server

Is it some possible to clone etckeeper git repo on my computer, make some changes and after that push to /etc folder on server? I tried this but i have problem with push because etc is noa a bare repo. Thanks for help. BR,
Rafał Kamiński
  • 51
  • 1
  • 5
3
votes
5 answers

Formal and actual parameters in a function in python

I'm kind of confused on how to identify the formal and actual parameters in a recursive function. For example in this block of code for getting the factorial of a number: def factorial(n): if n == 1: return 1 else: return n *…
Czar Luc
  • 85
  • 1
  • 2
  • 11
3
votes
3 answers

Git: branch has lost its history?

Something wierd has happened — my develop branch has lost all it's history till the last commit. Can anyone suggest the reason? Last things I've done — installed that forked brotherbard GitX and started to use it (primarily for history viewing, but…
average dev
  • 1,128
  • 7
  • 22
3
votes
2 answers

fork git branches and see them with SmartGit

According to this post I want to see into the SmartGit git client the ramifications for the new branches. Bellow, I will explain in detail the steps I do and what SmartGit displays and what I expect to be displayed: Steps: s1) create a local git…
Nelly Junior
  • 556
  • 2
  • 10
  • 30
3
votes
2 answers

Git checkout files from a branch without tracking them

My question is this: I have a git repo with a directory in the .gitignore file. Normally this works and any files that are changed in the directory are ignored. However if I checkout files into the ignored directory from a branch that doesn't ignore…
N.M.V.
  • 45
  • 3
3
votes
2 answers

Git (Process): Use Rebase or Double QA?

Our shop has a fairly rapid deploy cycle (1-2 weeks between when the code is written and when it's released). As such, after a bit of experimentation we've adopted the following pattern for our Git usage: Developer creates a branch, based off…
machineghost
  • 33,529
  • 30
  • 159
  • 234
1 2 3
…
99 100