GIT: merge branches twice
I have a problem during merging two branches. Consider the following git history structure:
And I need to merge 'feature' branch in point (1) and (2).
(1) merged without any problems, but the second one shows
warning: refname 'feature' is ambiguous
Could you help me, please? Thanks.
Solved. The problem was in tag with name 'feature' :)
How can use merge-base with Git on a remote repository without checking it out? Using ls-remote works fine e.g. for determining branches like this: git ls-remote --heads $REPO_URL/$REPO_NAME The docu
When I was working on merging couple of branches, i have accidentally created a branch instead of merging, Example : I was checking the list of branches available in the local and origin by typing gi
I was wondering where Git saves all the data from branches. Everytime you switch a branch all the data is put back in-place and data from another specific branch is just removed. Does it take longer o
Lets assume that we have one development branch 'A', and two sub branches 'B1' and 'B2', (both taken from A). Lets say that you run a format code command (in our case ReSharper's cleanup code) on the
My project has two branches in the remote server, the master and the release branches. We develop the app on the master branch. When we make a release, we want to copy the code from the master branch
I currently have imported a huge project from SVN to Git. I decided to flatten out all branches and keep only 2. Master branch and Diverged branch. Master: A-B-C-D \ X-Y: Bugfix Diverged: E-F-G-H The
I have a quick question regarding local and remote branches in git. Is it common practice for your local branches to be mirrored on your remote repository? It seems to me as though this would make sen
My current situation I have 2 git repositories of the same software project, where one is the fork of the other: fork: A1 - B1 - C1 - ... - HEAD_FORK : (Some changes done outside of git) : orig: A2 -
When I use bash autocompletion in Git, it keeps showing me branches of old remotes that I don't have anymore. When I do a git branch -la it shows those old remotes and branches while a git branch -l w
Could anyone please tell me what the difference between these two commands: git merge --squash and git merge --no-ff
I usually develop new features of my codes in dedicated branches, then merge them to master. The problem with this is that after some time I have a lot of obsolete branches that are cluttering the git
I have two branches in my local git repository, master and Logging. Both branches have remotes on BitBucket. master is the main branch of the project I'm currently working on. When other developers ha
How can I list branches with no descendants in git? I want a way to list all distinct development paths, for example, to determine which branches require merging.
How to auto merge git branches prior to a jenkins build I have 2 builds, for branch master and production I would like to do git merge origin/master when I do the production build.
Possible Duplicate: Git Merge: What does this mean? Git diff --stat explanation Sorry for the stupid question, but i can't find a clear answer anywhere. When you merge two branches in git, you get a
Threre are multiple resources that will tell you how to revert a branch merge in git in case you figured out a bug in the branch. The steps following such a merge will either be reset/correct errors i
I must convert a branchy mercurial repo into a git repo AND continue to pull changes from mercurial to git (one-way only) for some time. Existing hg-to-git answers do not seem to handle branches corre
We have a project hosted on Github with a main development branch called Master. Some developers tend to merge project branches into Master. And others tend to merge Master into project branches. S
I'm puzzled how to use branches in git to save temporary work. This is what I tried: /tmp/gt > git init Initialized empty Git repository in .git/ /tmp/gt > date > t /tmp/gt > git add t /tm
Having no remote repository, just one local repository with two branches. $ git branch -a master * devel Are following commands in this context the same/synonym? $ git pull . master and $ git merge
i am wondering what happens if you squash between branches and push/pull from remote in between. DEVELOPER 1 1. $ git checkout foo 2. $ git commit -m 'changed file' file.txt $ git commit -m 'changed a
I have two branches with the exact same file (incase you are wondering it is a .sql file) and I want to interactively merge it. Pretty much I want to open up a diff program like I do when there is a c
I am reading the CAVEATS of git-svn. via this SO question. What I understand is that: If you are mirroring svn trunk, branches etc on git repo, don't merge or rebase anything locally on those branches
Can 2 Git clones push/pull to each other without having remote tracking branches representing the other? I know they're very useful most of the time, but I might occasionally want to pull/push between
I'm looking for some advice on how I can achieve the following using Git: Branches: master (stable branch) unstable All work is done in unstable branch, in which the code might not work at any point,
Here's the situation. There are 3 branches on github: master, his-tests, my-tests Let's forget about the master branch for a moment. After the initial work on master, a person I work with created a br
I want to merge to very diverged Git branches together. That will be a lot of work because they have several hundreds conflicts. What would be the best way, so that maybe also others can help me and a
Git branches ideally should last for short time, probably for 1-2 days. Then it gets merged into some mainline. But in some cases, where we work on very big features, we maintain branches. And when 2
I can't seem to get git log --branches to correctly filter its output. It seems as if Git ignores it. For example, the head of git log --graph --all --decorate, prints: * commit 3ae0d17538f787bdde68f3
When is it recommended to use git rebase vs. git merge? Do I still need to merge after a successful rebase?
We're working with git in a master and multiple branches strategy. How many branches? A lot, some quite long living (10 long living team branches and 20-30 short living branches off them is normal
The git branching model has a workflow in which we have two branches with an infinite lifetime : develop and master where master reflects a production ready state and develop a state with the latest d
I'm trying to combine code on two branches with the 'git merge' command, but git is crashing during the process. I need to find an alternative way to merge these branches. To increase merge output to
I did a large merge from develop to master and Git handled it mostly correctly. But there were three files that definitely existed in both branches prior to the merge but Git only recognized the old o
I'm wondering if I can do selective merging, just merge back added files (that is, files in some branch with filesize changing from 0 bytes to some number)? The reason is that octopress's generate is
I am using git-svn with the following workflow now git clone <SVN TRUNK URL> #done once subsequently when I work on a feature git branch featureZ git checkout featureZ #make edits for featureZ
I've got a pair of git-svn branches which have been manually kept in sync by applying patches and what-not; git-merge has not been used. The branches are now in sync, which is to say that git diff A B
Suppose my Git repository initially has two branches: Foo and Bar. ... ─ Foo ... ─ Bar I create a third branch, FooBar in which I commit the merge of the two other branches. ... ─ Foo ──┐ FooBar .
What does happen if i do a git merge from another branch, some conflicts happen, the merge does not get commited, and then i do git reset --hard HEAD can i do the merge again? or will git believe tha
I have a couple of Git branches: 'experimental', 'something' and 'master'. I switched to the 'experimental' branch. I noticed a bug which is unrelated to 'experimental' and belongs to changes which ha
I thought I had already a decent grasp of Git, but just now I've been surprised. I thought that branches would isolate the changes from other branches, so I started a big experimental refactoring in a
I am working with git, still fairly new to working with branches, and I am coming across a real odd problem. I am not sure what is going on to be honest. I am creating a git repo then adding a readme
I have a simple scenario: 2 branches: master and myownb: myownb is ahead of the master branch with 3 commits: What I need is to merge these 2 branches, but not in the classic mode. I would like all
Here's the setup: We have a documentation team, who works in their own git repository. In the main product repository we have master and beta branches, beta was branched from master at merge ID 12345.
I'm having trouble merging two branches with Gity. When I do a checkout on my alternative branch and click: Merge into master nothing seems to happen... Any thoughts?
I have 2 branches master and slave, both branches did alot of changes. While merging, some folder need to be overwrite, some need to solve conflicts and some can just merge normally. What I wish i
Suppose I have two branches of a project IMClient-MacOS and IMClient-Windows, and their code only differs by (let's say) one directory main/. All the other directories contain system-independent code
develop branch --> dashboard (working branch) I use git merge --no-ff develop to merge any upstream changes into dashboard git log: commit 88113a64a21bf8a51409ee2a1321442fd08db705 Merge: 981bc20 88
I have a repository on GitHub that has two branches, namely master and gh-pages. The master branch is basically a static website, but I use GitHub pages to have a project page with a demo button tha
Is there any way of simulating a git merge between two branches (current working branch and the master), but without making any changes? I often have conflicts when I have to make a git merge. Is ther