Alex Rivera | Logout

Questions tagged branching-and-merging

15 questions

Sort by: Newest Votes Active
34
votes
2
answers

How do I use git flow with a staging environment?

git branching-and-merging git-flow
asked 2013-04-15T17:26:12.960
18
votes
4
answers

How to find all unmerged commits in master grouped by the branches they were created in?

git branch commit branching-and-merging
asked 2013-03-23T17:30:28.383
10
votes
4
answers

How should I handle a pull request in BitBucket which requires some tweaks?

version-control mercurial open-source branching-and-merging
asked 2013-03-06T20:51:10.967
8
votes
1
answers

Git missing code after merge

git github branching-and-merging git-rebase
asked 2012-11-17T10:47:15.653
8
votes
2
answers

SVN merge reintegrate missing ranges but nothing to merge

svn merge branching-and-merging svn-reintegrate
asked 2012-10-24T19:09:12.887
45
votes
4
answers

Are merges in Git symmetric?

git merge branching-and-merging git-merge symmetry
asked 2012-08-30T08:08:13.013
13
votes
2
answers

Stuck with two default branches in Mercurial after broken branch commits

mercurial branching-and-merging
asked 2012-08-22T12:51:12.053
19
votes
2
answers

My git branch is showing 'origin/master' and 'origin/HEAD' in Sourcetree and I don't know how to merge the two

git branching-and-merging
asked 2012-07-17T16:59:08.830
184
votes
6
answers

git cherry-pick not working

git branching-and-merging cherry-pick
asked 2011-08-15T23:33:21.097
15
votes
1
answers

Git-flow reopening a finished feature

git git-branch branching-and-merging git-flow
asked 2011-05-25T17:10:56.257
26
votes
5
answers

TFS 2010 Branch Across Team Projects - Best Practices

tfs shared-libraries branching-and-merging
asked 2011-04-19T18:05:19.817
29
votes
3
answers

Show only history of one branch in a Git log

git branching-and-merging git-log
asked 2011-01-07T19:16:14.200
14
votes
4
answers

How to move some last Git commits currently on a branch, onto another branch?

git branching-and-merging
asked 2010-12-30T13:30:45.017
13
votes
7
answers

Perforce: Find source changelist for a branch

version-control perforce branching-and-merging
asked 2010-11-03T15:04:15.640
9
votes
6
answers

Finding where source has branched from git

git search diff branching-and-merging
asked 2010-06-23T15:47:06.457