When creating a branch for a new feature, once merged into master, how to delete?
I created a branch just for a feature, and now I am in the master branch, and I did a merge.
I don't really need this branch now, how can I delete it?
I pushed my code to a remote git server, but I believe the remote git doesn't pickup my local branches since I didn't tell it to right?
I am creating named Mercurial branches for new features in my application, and after I finish a particular feature, I merge that branch into default branch, and close this feature branch. But I wonder
I have two branches dev and master. I want my dev branch to be completely overwritten by master branch as I know master is latest. How can I do that using Tortoise GIT UI? I tried to do merge using To
I am confused with git merge. Suppose i have feature branch taken from master and they have divergedliek this and they merged like this Now i want to know that what will be the diagram after this com
I have a local branch I'm working on that is a copy of master, called mybranch. I have changes to that branch that I want to merge into master. However, there have been updates to master that I need t
In our team we are usually pushing all tasks into separate branches, and after that release-manager review those branches and merge them into 'master' branch Sometimes team-members forget to merge the
I have a git repository with multiple branches. How can I know which branches are already merged into the master branch?
As you can understand I'm still learning Git and how branch works. Anyways: I was working on a local master branch. I created and switched to a new fcwdetection branch for adding some code, using my
I'm trying to migrate from TortoiseGit to SmartGit. TG has quite clear interface for creating new brach: But in SmartGit I've found only Branch -> Add Branch which shows quite poor dialog: I do
If there are multiple developers working on a feature branch, and we need to periodically bring in changes from master, there are two approaches that I know of: developers communicate that they have
this should be a relatively trivial problem, I just (very) new to using Git, so please forgive the simple question. I need to get some updates along our Development branch into a Feature branch becaus
Currently I am working in a feature branch that will soon be merged back into master. I recently tried just that and had some merge conflicts, which I had to fix manually. So, is it possible to tell
When using the Feature Branch workflow with a small team (not Gitflow), is there a convention for applying a hot fix to a release that was previously tagged on master? For example: v1.0.0 is released
I have a clone of a repo on Github in which I created a new feature for upstream. The problem is, I did that in my master branch which also contains other stuff I pulled in from other clones. That tot
I am trying to keep a feature branch up to date by merging trunk into the branch. Problem is, that about 2000 files that was there when the branch was created, and that has been left untouched on both
Our workflow is as follows: Create feature branch from trunk Do all development in feature branch While working in feature branch, regularly merge trunk into branch to stay in sync with trunk. Once f
I'm using Git Flow for my project, and have completed the git flow feature finish step that merged my feature branch into my develop branch. I then performed git push to GitHub, but on GitHub I still
This question already has an answer here: Move commits from master onto a branch using git 1 answer I've created some changes to a git repo, and committed them to master(I have NOT pushed
We have a master branch into which we've merged about 10 feature branches, one at a time. So the recent history looks like this: merged feat/10 (HEAD of master) merged feat/9 merged feat/8 merged feat
Using subversion v1.6.6 and TortoiseSVN v1.6.6.. After having created a branch and meticuously adding detailed comments whenever doing a commit on the branch, I can't seem to find those comments after
How do I pull master into the current branch I am working on, and see the conflicts? Also, should I merge or rebase, not sure which of the two is correct.
If I say have a test branch that I never want to be merged into staging, would that be possible to set up? I.e. if I have feature-branch-a and that is merged into test it would not be possible to merg
Recently I have started to implement new experimental feature for my project. Unfortunately I forgot to branch before starting and pushed several commits onto shared repository server into the master
How do I rename a branch 'a' to 'master' and rename 'master' to 'b' in gerrit? I have recently switched to gerrit from a shared git repository.
I have two branches: 1. master 2. tmp tmp branch is detached I need to put tmp branch on top of master with resolving conflicts in priority of tmp ?
We find ourselves in the situation where master has new feature work, and feature1 (which branched off master) is the stable master. How can we change things so that they trade places? I.e., feature
To delete a local branch in git I use git branch -d, but how do I safely remove a remote branch? I would like to delete it only when the remote branch is merged to my current branch.
Here's my scenario: My project is following the topic branching pattern. I create a branch to fix some problems, let's call this branch problem_fixes. I make my changes, and submit a pull request. I
When I create a new branch using the Github Mac App, that branch does not show up on the Github website. Also the other way around is the same, when I create a new branch using the website, that branc
Git will by default deny deleting a local branch (via git branch -d mybranch), if that branch is not fully merged. However, if I delete a remote branch via git push origin --delete mybranch, there is
I'm using BitBucket.Already I pushed a branch to master and merged with master.Now I need to revert the pushed branch from master.How to do it? In my case: I have to revert last five commits and I nee
I need to release only certain stories that have passed QA. I don't have access to the branches, only the master branch. There will be another release in two weeks, so I was thinking of just creating
Okay. If I'm on a branch (say working), and I want to merge in the changes from another branch (say master), then I run the command git-merge master while on the working branch, and the changes get me
Here's the scenario: I've created a new repository for a codebase and made a few commits, but I've decided there's some part of that codebase that should be in its own branch rather than on master. Ho
I followed this tutorial but I'm having trouble creating a new branch in a new repository. This is the error I'm getting: What am I doing wrong?
I know that I can do git branch --merged to show what got merged but it just outputs everything. Is there a way to filter by date?
How can I see the history of a particular branch? I have been creating and merging branches. However, on one particular branch say for example new_feature. I want to know the history of what has been
I ran into problems by merging the master branch with my feature branch. So I tried to understand how git handles merges and what's the best way to update a feature branch with the changes from the ma
I usually create branches for the different segments of code but once in a while I forget to create a new branch and everything is happening on the master branch. How can I say to git that although I
I was wondering if somebody could explain to me how to GIT merge master into a new branch and then clear out master as to have master clean working directory. In other words: master -> PHP since ma
While checkout to master branch, I got: Error: The following untracked working tree files would be overwritten by checkout: nbproject/private/config.properties nbproject/private/private.properties nb
There is an open source project on GitHub. Its original repo contains the most recent master branch. Now there is someone (not me) who has forked this repo, created a development branch from the maste
I am new to git. I and working in the dev branch. I need to merge one file to the master branch in my local repo and then check in the master. How do I do that? I see this on guthub cheat sheet but qi
I have review A that has been dependent on the review B. Review B has been merged. My goal is to get rid of dependencies from review A, namely remove B, then switch to the last master changes. I am a
I have many git branches. How do I delete branches which have already been merged? Is there an easy way to delete them all instead of deleting them one by one?
I'm trying to clear up an svn tree. There's a trunk directory and a branches directory, containing a folder with the hopeless name main-branch. I want to find out if it was already merged into the t
I follow a development process where I create a new local branch for every new feature or story card. When finished I merge the branch into master and then push. What tends to happen over time due to
So i usually have a feature branch and then arc diff master to create a differential revision off master branch. How will i make a revision on a repository that has only the master branch? Should i ha
I recently merged a branch I was working on with the 'master' branch. I must have (still kind of a git n00b) done something when pushing or pulling that created both an origin/master and an origin/HEA
Someone else can better reword this question, but here is what I want to do: I have been working on a long lived major-refactor branch B. I have been regularly merging master in and by now branch B is
The following command: $ git branch -a yields * develop master remotes/origin/HEAD -> origin/develop remotes/origin/develop remotes/origin/feature/foo remotes/origin/master but I don't want remote