branching-and-merging Questions
3
Solved
EGit strikes again. I made the mistake of trying to switch to a different branch in EGit and it somehow messed up and checked out no branch. I then made a commit to this non-branch, and then when I...
Wearable asked 16/1, 2013 at 19:1
11
Solved
I've got two branches from my master:
v2.1: (version 2) I've been working on for several months
wss: that I created yesterday to add one specific feature to my master (in production)
Is there a...
Groat asked 19/3, 2010 at 0:51
2
Solved
I want to reset master to a previous commit, but I also want a PR for my team to approve.
So far I did this:
create a local branch from master
git reset --hard d94kjf8
push to remote
Now when I g...
Stingy asked 1/10, 2021 at 16:11
3
Solved
I have some template/starting point code that I reuse across projects. While working on the new project, I always want to add and change things in the template.
Develop the template alongside the p...
Cracked asked 6/4, 2011 at 20:50
3
Solved
I've got some developers who shouldn't get Admin access to a team collection or the project so they're not deleting the code.
However they need to be able to branch.
We recently upgraded to TFS ...
Royalty asked 17/1, 2014 at 23:26
1
Solved
I have merged a develop branch into main branch using squash merge. Let's say there are commit A, B, C merged into main from develop. The changes are successfully merged. I can see the squash commi...
Aeroplane asked 20/9, 2021 at 21:48
3
Solved
This is very similar to How can I know in git if a branch has been already merged into master? but is about checking for rebased code. In the repository I am currently working on it seems that a fe...
Suspend asked 17/12, 2015 at 10:49
6
Solved
I'm trying to cherry-pick a commit from master and get it into the current production branch. However, when I execute git cherry-pick <SHA-hash>, I just get this message:
# On branch prod_20...
Humankind asked 15/8, 2011 at 23:33
3
Solved
I'm the only one in my organization who's making commits with the following message:
Merge remote-tracking branch 'origin/develop' into develop
Not sure what I'm doing to cause them, but I'd ...
Smalley asked 20/6, 2011 at 4:15
1
Solved
Consider the following practice:
A developer branches from main and creates as many commits as needed in a feature branch
Once the feature is completed, all commits are squashed and merged into th...
Chafee asked 2/7, 2021 at 18:27
3
Our (small) team works on Bitbucket for VC. At the time of writing this, our repo has 1550 branches, and we have many (~150) "active" branches. My question is about these "active" branches.
The nu...
Innerdirected asked 26/8, 2019 at 17:19
2
I'm trying to find a way to stop users who have worked on a branch (who have committed changes on a branch) form being able to approve in a pull request on that branch. The idea that a dev can't ap...
Constructionist asked 17/2, 2021 at 11:44
2
Every time I create a repository on GitHub and push my files it creates two branches, the main branch and the master branch.
All the changes go to the master branch and when I go to 'Compare and pu...
Sardella asked 27/1, 2021 at 17:16
4
Solved
I have a branch A in which I have made some changes a, and then I created a new branch B from A to continue to make some changes b, so that the total changes in B are a, b. Finally, someone e...
Giovannagiovanni asked 4/9, 2020 at 7:31
2
Solved
I have trunk and a release branch. If I fixed a bug in release branch, I definitely should integrate the fix back to trunk. However, I didn't find a command dedicated to integrate such a single cha...
Drue asked 24/8, 2012 at 9:8
3
Solved
Is it possible, to merge a branch and automatically delete it with a single command? The delete step should only be executed if merging was successful.
Murrelet asked 19/2, 2016 at 14:6
4
Solved
After merging a branch, do you delete it from the repository?
Is it a good practice or not?
I usually create a lot of branches, since I don't want to break my current release, and I'd wish to delet...
Canikin asked 26/5, 2012 at 10:7
2
Solved
I was merging master branch into new branch, there are some .rej files are created.
I took a pool of master branch into new branch I got conflicts which I've resolved but there are some .rej file...
Bailiwick asked 4/1, 2016 at 6:35
3
Solved
In our workflow, no "direct" commits are made into the master branch. The master branch only receives merges from Pull Requests.
We can think of each merge then as a new feature added to the maste...
Soberminded asked 7/2, 2014 at 9:18
10
Solved
How do I create a branch in SVN?
Hedveh asked 5/8, 2008 at 9:25
4
Solved
Lets say we have two branches (B and C) that have diverged from a common ancestor A. Will merging from B to C produce the same result as merging from C to B?
A
|
/ \
B C
To clarify- I'm assum...
Alphabetical asked 30/8, 2012 at 8:8
3
Solved
In TFS (We are using 2012) why is the default to convert your source folder to a branch?
I really don't consider the source a branch. What, if any, advantages/disadvantages does this have?
Dawnedawson asked 16/10, 2012 at 13:30
3
Solved
My current pattern is to merge topic branches into my main development branch once they're finished. The log has been getting kind of crazy to look at lately, and I was considering switching to usi...
Courbevoie asked 3/4, 2012 at 20:11
2
Solved
I have one remote repository with many branches. For example, my repository name is:
http://navis.com/MyRepo.git
Its branches are:
development
production (master)
testing
I would like to merg...
Aniela asked 27/1, 2015 at 4:0
1
We use a peer-review process where reviewers are asked to merge in to a Review branch when done.
Thing is, after review, we wish that our master branch gets automatically rebased with what Review ...
Blintze asked 4/11, 2019 at 4:41
© 2022 - 2024 — McMap. All rights reserved.