Questions tagged [branch]

The tag has no usage guidance.

Filter by
Sorted by
Tagged with
-1
votes
1answer
258 views

RTC to GIT migration

I want to migrate all streams with history to new git branch.Can you help me.Is there any tool or any solution simply?For example for each stream I want to create a brach in git with stream history
1
vote
1answer
443 views

git Can't switch branch because of changes I can't commit

I have a git repository that's public on github. There, I have a local file I don't want to share to the public, while other team members want it to be public, so I did git update-index --assume-...
0
votes
0answers
50 views

Git Rebase twice

I have done git rebase twice git rebase -i HEAD~3 (because I have 3 commits , principal one , second merged to the first one and the third last one) After that I found that the third commit shown is ...
3
votes
2answers
860 views

What does [1 note] means in Git(Lab)'s commit tree?

My company is using a private GitLab. I recently looked to the graph of branches and commits, and it showed this. A [1 note] label that looks like the labels GitLab uses to show the branches' heads (...
0
votes
0answers
21 views

Github Branch Creation Data from API

I want to analyze open source software collaborations. For my purposes I need to get the approximate point in time when a branch was created, even if it was merged afterwards. Is there a way to get ...
0
votes
1answer
22 views

Replacing published branch

Suppose there is an upstream project that does not use git, and that I am maintaining a codebase based on this project's released tarballs. I maintain a git branch master and my branch my from it. I ...
0
votes
2answers
143 views

Centralizing data AWS

I want to centralizer about 1TB of data in AWS for 3 on premise locations (5 users each location). We are going growing but still small. Each location has a 30/5mpbs connection. Each has its own Linux ...
0
votes
2answers
329 views

Can't do proper git pull request

I'm new to GitHub and therefore I messed a lot with it, so I need some step-by-step help. Sorry for being annoying :/ Also, before I say anything, I'd have to clarify that I used only GitHub, because ...
2
votes
2answers
12k views

Removing a file in a branch in git implies removing it from the master branch as well?

I just faced a situation that seems illogical to me with Git. I have a repo with a plenty of commits, so at this stage it has only one branch (master). Suppose this branch has a file called MyFile....
8
votes
2answers
6k views

Accidentally worked on wrong branch in Git

I did some work on the wrong branch; I forgot to check out the right branch. Is it possible to change to the other branch and commit my changes there?
0
votes
1answer
104 views

Git branch: branches not different

For a few days, I have a problem with git. Let's assume I have a branch "master". I create a branch "normal", I "git checkout normal", and then I change my code a bit. If I "git checkout master", ...
0
votes
1answer
649 views

How to split branches on a mercurial repository to make other repositories using HG commands?

For example, I have the following history on my HG repository (i.e. I created a branch on rev. 80), named "Project X": Project X Workbench: ------------------------------------------------------------...
2
votes
1answer
103 views

Get git-repository commit into different git-repository branch

Consider the following setup: One Repository1 sits on Bitbucket. A local working copy is situated on my machine. I change files locally, commit and push to Repository1. Changes in Repository1 (on ...
2
votes
2answers
1k views

Tortoise CVS merge branches

I have two branches DEVELOPPEMENT and DEVELOPPEMENT2. I would like to merge DEVELOPPEMENT and DEVELOPPEMENT2 into a same branch but not in the HEAD yet. How to do it with the Tortoise HMI? I cannot ...
1
vote
2answers
182 views

Pulling changes into remote tracking feature branch while keeping simple branching workflow

We're a team of a couple of developers that have our master branch and develop features in feature branches. We branch release branches of master when we release. All bug fixes are made in master and ...
5
votes
2answers
15k views

Can checkout and track git branch, but cannot pull

So we have a branch in our git repo called creative_market. I run the command git checkout --track origin/creative_market which works fine. All of the changes that should be on the creative_market ...
1
vote
1answer
262 views

Git repository migrated from Mercurial shows unnamed branches

https://github.com/lextm/sharpsnmplib/network This repository network graph shows lots of branches (were created in Mercurial), but none of them has a name. Is there a way to add names?
1
vote
1answer
100 views

Add svn-repo as branch to git

I have a git repo, but my boss wants to see the code in an SVN incl. commit-messages. Is there a way to add the SVN to git as a branch (like boss-branch), so that I can work with my own branches, ...
0
votes
1answer
259 views

How to read the o/p of the 'git log' command?

I have cloned a Git repository and would like to visualize the different branches and merges. I ran the following command. git log --graph --full-history --all --color \ --pretty=format:"%x1b[...
6
votes
1answer
2k views

PDFs in git, reduce size

I have a git repository with many PDF files in there. The git repository is increasing so much in size that it's very complicated to clone the repository to a new host when the Internet connection is ...
1
vote
1answer
106 views

git archiving old folders

i have a big git repo with some old folders in there. i dont need them in my master branch and they are a little bit annoying there but i dont want to loose the data, so archiving would be great. now ...
2
votes
2answers
436 views

Merge master functionality into shared branches in Git

Suppose that I have several shared branches on my Git repository, for example: newfeature, experiment and gtkgui, and I share those branches in the origin repository. My team and I make some changes ...
6
votes
1answer
918 views

Go back in time and create branch?

I'm trying to do the following thing in git: Go back a few commits (master branch) Create a new branch Restore the latest commit on the master branch (go forward) The order is not important, it ...
0
votes
1answer
267 views

How to setup a dev branch in git?

A bunch of us are working on a shared repository and using git for collaboration and version control. We actually use gitolite in the backend. We felt the need to have a dev branch so that the ...
7
votes
2answers
280 views

Git branch for instances of a website?

I'm working in a couple of websites, both websites needs almost the same code except for some changes in images and css, or settings. I'm just finished to read the chapter of branchs of Pro Git book ...
5
votes
1answer
5k views

How to set to pull the same branch by default?

When I pull from the new added remotes, I have to specify the branch name explicitly: $ git pull remote1 ... Error: you didn't specify a branch name. $ git pull remote1 master Though I'm working ...
7
votes
2answers
5k views

Is it safe to delete a branch from a github fork once it's been merged upstream?

I've only recently tried my hand at forking in github and would like some "best practice" advice. I created a branch in my fork, and that branch got pulled into master of the upstream project. It no ...
1
vote
1answer
1k views

GIT : I keep having to merge my new branch

I have created a new branch and I'm working on it with others dev but for reasons when I want to push my new commits I always have to git merge origin/mynewbranch Otherwise I'm getting some errors: !...
1
vote
1answer
105 views

git grab one branch instead of everything?

I found out the latest tag of something breaks code and someone has committed a fix thats in master. I'd like to rebuild my source. How do i tell get to pull just master and not the history, etc from ...
70
votes
1answer
158k views

GIT merge master into a branch

I have been developing a new feature on a new branch, and on the side have committed quite a few changes on my master branch. Is it possible to merge the master branch into my new branch to keep it ...