branching-and-merging Questions
4
Solved
I have a repository where I had been working on master branch having last added some 10 or so commits which I now wish were on another branch, as they describe work that I now consider experimental...
Harvell asked 30/12, 2010 at 13:30
2
Solved
We had some changes committed (let's call it changeset1) in what we call the Dev branch of our project that really should've been done in a new branch. So what I did to fix it is create a new branc...
Knowledge asked 5/9, 2019 at 21:13
2
Solved
In order to find the common ancestor of 2 git branches, one needs to do:
git merge-base branch another_branch
Okay. But... what if both branches have already been merged? When I use merge-base i...
Corina asked 30/4, 2017 at 23:27
1
Solved
From a task on a board in Azure DevOps I can click on "Create a new branch" as shown below.
This will open a dialog in which to specify the name and base for the new branch. To save time — and ...
Hassi asked 19/7, 2019 at 14:31
2
Solved
I would like to know if it's better to delete your branch after merging to master or if we should continue to work on the same separate branch during all the project.
i.e If we are 3 members in th...
Unformed asked 10/4, 2019 at 15:0
8
Solved
I'm a team leader in our web development company, and I'd like to implement Git workflow in our team. Reading documentation and articles I've found the following structure good for us:
We have a r...
Podgy asked 13/2, 2013 at 23:34
2
We are using the develop branch development model in one of our projects.
o - - - A - o - o - o - o master
| \ /
\ o hotfix1
\ \
o - B - o - o - o develop
In the above diagram a hotfix1 is re...
Overbuild asked 5/4, 2019 at 15:24
5
Solved
I'm having issues understanding how to configure TFS according to best practices as provided by the TFS Ranger team. The issue is such:
My company has several products which make use of a shared c...
Amplifier asked 19/4, 2011 at 18:5
9
Solved
I'm trying to take a branch with changes and bring it back to be identical to the upstream it diverged from. The changes are both local and have been pushed to github, so neither git reset or git r...
Scottscotti asked 6/2, 2011 at 5:33
3
Solved
I have 2 branches, the main one and the one I'm working on a parallel release.
A --> B --> C (master)
\
-> E --> F (parallel)
The parallel branch will always merge from master. Alw...
Irritability asked 12/9, 2013 at 17:50
3
Solved
I have 2 branches, the main one and the one I'm working on a parallel release.
A --> B --> C (master)
\
-> E --> F (parallel)
The parallel branch will always merge from master. Alw...
Shiri asked 12/9, 2013 at 17:50
2
The simple situation I find myself in at times, where I am working on some changes and I create a branch. As I move along in my changes I start finding some things that need cleanup or some other p...
Shaveling asked 18/3, 2017 at 17:36
1
I am working in a branchX and it has a dozen config files that I do not want to commit. So i marked all the config files as --skip-worktree. Now I want to change to branchY. How do I do it?
I trie...
Deviltry asked 3/5, 2017 at 21:21
3
Solved
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...
Himelman asked 22/1, 2012 at 18:16
3
Solved
We use Subversion and aside from a few individuals such as myself there is little to no experience with branching and merging in Subversion. My Subversion experience is limited to simple feature br...
Diabolo asked 12/11, 2012 at 14:39
2
Solved
We are trying to follow the gitflow branching model, but with a twist.
We have have four servers environments where the product can be deployed to, each server serves a purpose : development, inte...
Pneumodynamics asked 27/6, 2016 at 8:10
3
Solved
I'm hoping someone can help me with this as I'm scratching my head to understand what is going on, and if it can be rectified.
I'm currently working on a project in VSTS and using GIT as the code ...
Antibaryon asked 19/2, 2018 at 8:36
7
Solved
Having two branches, how can I find the latest revision(s) where the two branches were merged? Is there a standard Mercurial command to do that?
This is the same as question How to find the common...
Clydesdale asked 9/11, 2011 at 15:16
1
Solved
We have two branches -- 'master' and 'release'
And we have one file, like fileA, we want to keep different version on these two branches.
But each time, we have to merge 'release' into 'master', ...
Ingathering asked 24/2, 2015 at 8:59
4
I made many different changes in a single branch and now I want to move some of the changes to a new branch so that my pull-requests are more specific.
Now I know that I can do something like: git...
Mandate asked 14/12, 2017 at 17:52
3
Solved
I branched my github project to create the static page the other day but messed up with my author name
https://github.com/ronaldsuwandi/le-simplepage/commits/gh-pages
How do I rename the author f...
Mauri asked 15/4, 2013 at 1:52
5
I'm currently working in a project where branching and merging haven't been working very well at all from the start. In order to change this, we've been talking about loads of different ways to do ...
Thimbleweed asked 12/5, 2011 at 14:27
2
I know how to delete all local branches that have been merged. However, and I believe this is due to Github's new pull request squash and merge feature, I find myself being left with a lot of local...
Causative asked 5/4, 2016 at 14:15
3
Solved
I've read in many places that renaming a branch is rather problematic in TFS 2010 : you may lose the history of the branch you just renamed ( as seen in this article or in this SO question )
I can...
Dube asked 20/3, 2013 at 11:26
2
Solved
I have a feature branch that I work on. Yesterday I did a commit and also merged my feature branch into the remote master branch.
Now I wish to continue working on my branch and add more function...
Ensor asked 3/11, 2017 at 4:30
© 2022 - 2024 — McMap. All rights reserved.