The tag has no wiki summary.

learn more… | top users | synonyms

0
votes
1answer
60 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
35 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 ...
1
vote
2answers
244 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 ...
0
votes
2answers
96 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 ...
4
votes
2answers
4k 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
114 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
81 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
167 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 \ ...
5
votes
1answer
786 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
36 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
1answer
81 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
366 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
234 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 ...
6
votes
2answers
207 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 ...
3
votes
1answer
3k 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
1k 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
593 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
76 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 ...
33
votes
1answer
25k views

GIT merge master into a branch

I have been developing a new feature on a new branch, on the side I have committed quite a few changes on my master branch. I would like to know if it's possible to merge the master branch in my new ...