Delivering Git branches for testing
I am using Git for development and rather simple workflow. I have two remote branches: "testing" and "staging". I develop feature in a local branch, merge it to "testing" to deliver feature for testing by tester. As feature is tested I merge local branch to "staging".
Important workflow condition is that we have no releases - we have to deploy features separately.
It works just perfect until conflicts.
My workflow considers I have to deliver same feature for testing several times during feature development because of permanent conditions changing.
The problem is that in case I had 5 feature deliveries for testing and got merge conflict at first delivery, I have to solve conflicts again for all left 4 feature deliveries to keep my branch isolated. The worst thing is that all 5 conflicts I got are the same (the same pieces of code get conflicted) in most cases.
Is there a way to solve conflicts once upon first merging? How do you deliver your branches for testing by another person?
Any help and ideas are greatly appreciated. Thank you.
Newbie on git, i have two branches in my git project, master and feature, both branches share 80% of the same code, while the other 20% are different, Now i'm working on master, i make a commit on mas
My normal pattern is to branch from master, do a ton of work, then rebase and git svn dcommit. How can I clean up all my old branches? Basically I want to find any branches that have git-svn-id: in th
I'm using this awesome library called Gift to do all of my standard git things (pulling, reading commits, etc). However, I can't seem to get the remote branches. I believe the git branch -r command wi
When inside a Git repository, is it possible to add tab completion for branches to Powershell? For example: PS> git checkout maTAB would result in PS> git checkout master
I'm using EclEmma to test the coverage of the test class I have written (JUnit testing). I have enabled the assertions in Java using -ea. After running the coverage test, where I have used Java assert
Does git support a view where different files come from different branches? Here is my setup -- I have a simple git branch structure with master being used for all development and installs at the clie
The git cherry command is great for seeing what commits have happened between two branches. However, by default it just gives you a list of commit IDs - not that informative. $ git cherry master dev #
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,
So let's say there are three developers: Alice, Bob and Cecil. They decide to use Git without a central repo. They all setup remotes to each other, so that: * Alice has remotes/bob/master * Alice has
Struggling to understand how to work with remote branches and how many types of git branches there are I somehow got lost in differing namings and git versions. Here's a few things that happened to me
I'm using the following sources to expunge some large files and directories from my repository: http://dound.com/2009/04/git-forever-remove-files-or-folders-from-history/ Why is my git repository so b
Is there any reason to create branches for features in a solo git repo? When I merge them back into master, they fast-forward and there is no real evidence that I even branched in the first place. Sho
We have a central repo with 20 branches, they all use layout like: /.gitignore /file1.txt /file2.txt Now this should be changed to /.gitignore /ProjectFolder/file1.txt /ProjectFolder/file2.txt in al
I'm still new with Git so apologies for the noob question. Previously I've used SVN and worked on projects that had multiple branches. I'd have multiple VS solutions open at once, or at the very least
This question already has an answer here: git remote branch deleted but still appears in 'branch -a' 3 answers I want to delete some remote branches of my project repository. I've run the next
I have three branches: master, task_one, and task_two. I want to pull all updates made by other people, and apply these updates to all of my work. What are the correct commands?
I have cloned a repo with 2 branches from github: git clone https://github.com/user/repo cd repo when I do a git branch it only shows the master branch. Then I did a git branch -a it shows all branch
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 create 2 local branches to track remote branches: # git branch1 -t origin/branch1 # git branch2 -t origin/branch2 But after I do a 'repo sync' and I do a git remote show origin, I see my branches a
I've accidentally created -f and --force branches in my local git repository. Well, second one wasn't accidentally to tell the truth. Now I want to remove them, but git branch recognizes -f and --forc
There's a bunch of branches on one of my git repo's that I got when I forked it on github. I don't really care for my github fork to have these branches. Is there any way that I can push that will del
I have a module repository with some branches branchA, branchB etc. I would like to import these branches into a project repository using git subtree. I set up my project repository like this: git rem
I have a parent branch A with a child branch B. In branch B i have two separate commits. I merged branch B in A with squash like this git merge --squash B When i compare branch A with branch B: git l
When moving between git branches I sometimes forget the name of a branch I was recently on. How can I display a list of recently checked out branches/tags/commits?
I don't know if im misusing Git, or if I've got a configuration problem, so any clarity would be appreciated :) I clone my github repos onto machine A and B, then on machine A I do: git checkout -b br
Is there any way to see changes from many branches in Git in a single view. For example if my project consists of scripts part and C code part, can I have them on two separate branches but still see a
I have a git repository with lots of branches: git branch lists more than 20 branches. But ls .git/refs/heads lists only 4 of them. How can that be? To investigate the issue a bit, I created a test re
git tag commands gives us the info about all the tags on that repository. For example, if I do git tag, it displays tag1.0 tag1.1 tag1.2 If my repository has two branches.How can I come to know that
I am fetching origin like this: git fetch origin This will get all branches as master and dev. Then I push it to another remote mirror-server: git push mirror-server master Or, basically git push --
If I have a set of branches with common ancestor commit a, is there an easy way to rebase all of them onto commit b (where the common ancestor of a and b might be some third commit c)?
This question already has an answer here: Using Git, show all commits that are in one branch, but not the other(s) 7 answers I have two branches - master and experimental. How can I see which c
My super-project has two branches - master and dev. I initially had a submodule in both these branches, but now I need to keep it only in the dev branch. To do that, I switched to the master branch an
So I'm in a shell and I do the following: git fetch --all --prune git reset --hard git branch And the following is listed *master branch a branch b On the remote, there are two branches. master and
I currently have Git setup with a central bare repository which is accessed by two developers via remote repositories. I've hit on a problem when I've created a branch and then tried to push that bran
I have a Git repository representing a source repository pulled in from git-tfs. TFS has the convention of storing branches as full copies in folders. I'd like to run through the history of the git co
Do I lose my local branches when I uninstall git and install it later again?
I am new in git and have problem in merging. Scenario : I have a master branch. I create new branch dev from master start commits in dev branch . After two days I create new branch devmerge from dev b
I am currently working for a Scrum Team that is using a shared git repository with another Scrum Team. For ease, we will call my scrum team Autobot and the other Decepticon. Team Decepticon has full p
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
I understand conceptually that a branch I create in my local GIT repository must be configured to track a specific branch on a remote GIT if I expect the commands like pull to work without specifying
I have been using git-svn lately to manage an old svn repository through git. I have recently been working in a branch that i created like this: git checkout -b local-branch svn-branch I have then si
I know how to view the logs only for specific branches with --first-parent, like this: git log --oneline --graph --first-parent origin/master origin/topic1 The problem with this is that I don't see t
How to restore deleted branches. I've made git push --prune and seems that nearly all branches were deleted remotly. Please help me!!
I am developing a system where I'm following the trails of another project, adding my own stuff but not directly to the original project. I setup my repository with three remote branches: Master - Wh
I've created a bare repository than cloned it. When I do git branch -a nothing is showed. How come I don't even see the default master branch? Although git bash shows the following: /some/path/project
I've read a few git questions here, but could not find an answer to this one: I have a public and a private branches where I want to allow certain files to diverge. Those are configuration files with
I'm currently working on a git repository where something went wrong. Everytime I perform a pull, the origin alternates between two different master branches: git pull From git://git.eclipse.org/gitro
Dear All, I'm new to GIT and i want to move from SVN to GIT, in my application I'm using web services, for each web service i have bundle for API, bundle for IMpl, and another for service. I want to m
Since no one in our team is familiar with this question. I am asking this. I went through some articles and documentation, but this concept is very confusing. My question is regarding the git branch m
How do I pull all of the remote branches to my own repository? if I type: git branch -a I get a long list of branches, but if I type: git branch I see only 2 of them. How do I pull ALL branches into