All Questions
Tagged with version-control branching-and-merging
244
questions
0
votes
0
answers
21
views
what happens when we add origin before master while merging?
what is the difference between git merge --no-ff origin/master and git merge --no-ff master
when I don't origin it doesn't merge the changes.
What exactly it does. Can someone explain?
- 171
0
votes
1
answer
52
views
Plastic SCM missing both Merge and Switch Workspace menu options, using with Unity
I can't seem to find an explanation for why essential menu operations are missing in the Plastic SCM Branch Explorer Interface (Unity Dev Ops Version Control).
In Unity's Version Control window, I can ...
- 1,477
-1
votes
1
answer
116
views
Git branching model for working on multiple versions simultaneously in 2023
So we are slowly but surely moving our development from SVN to Git (about time). Our team is quite familiar with Git but the SVN repo is quite massive and with it comes a lot of other teams and ...
- 399
1
vote
2
answers
170
views
Git rebase a branch from a branch that's also been rebased
Let's say I have this situation where branch1 was created from master. After a few commits on branch1, I also created another branch off of that called branch2. After this, someone else committed (D) ...
- 292
1
vote
1
answer
123
views
find point where two branches in git FIRST diverged
This is slightly simplified from the real story, but hopefully close enough.
Suppose I initially have one branch: develop. Then I create a new branch: release.
At this point, release and develop both ...
- 1,639
0
votes
1
answer
428
views
Downsides of merging feature branches based on master to another collaboration branch AND to master?
Today I'm working with a trunk-based development styled branching strategy, which is not optimal from a deployment and collaboration perspective for different reasons. I have an idea to replace this ...
- 1,035
0
votes
2
answers
1k
views
New / Merged / Deleted branches not updating
So at my previous role, whenever someone created a branch in 'develop' I could refresh/ pull and the branch would appear in my VSC Source control. If a branch was deleted on GitHub, the branch also ...
0
votes
1
answer
242
views
What tools make it easier to manage multiple git feature branches while compiling them all together? [duplicate]
I am a contributor to some open source projects that take a while to merge PRs. At any given time, I might have 2-10 outstanding PRs. Some bug fixes, some enhancements, etc. While those PRs are in ...
- 7,636
0
votes
1
answer
105
views
Merge a non-squashable branch in a single commit without losing authors
So here is a diagram of the situation :
As can be seen in the image we have feature A branch from master in which some commits were made directly and some were made by making and merging grandchild ...
- 61
2
votes
1
answer
672
views
Git branch from a remote branch tag
Here is my setup
Remote named upstream points to the the branch where tag exists.
Remote named origin points to my fork.
I want to create a branch under origin that is even with the upstream tag. ...
- 369
0
votes
1
answer
101
views
Peepcode-git.pdf: Best strategy to keep a long standing feature branch in sync with main branch with rebase
In the following documentation peepcode-git.pdf located at https://github.com/pluralsight/git-internals-pdf/releases, page 39 notes different use cases for rebase. Particularly this quote:
"If ...
- 494
0
votes
0
answers
11
views
Git how to forget branches [duplicate]
so I am having trouble keeping my git tree clean.
First I am keeping branch for each new feature. Let's say that I create a branch called feature-1
git branch feature-1
git checkout feature-1
git push ...
- 39
0
votes
1
answer
246
views
Git Merging one developer branch to another developer branch before merging both branches to master (the main) branch
I need some advice here on git branching strategies
I am working on a development branch called branch 1
and my fellow developer working on another development branch called branch 2
we have been ...
- 5,606
0
votes
1
answer
423
views
How to ignore certain changes in some files when switching branches?
I think many reps have certain files with some sensitive information like a hash key, specific env variables or some machine specific configuration that are user related and not to be committed.
Is ...
- 320
-1
votes
1
answer
134
views
Branching Strategy GIT [closed]
We have doing feature-based development and once the PR is approved it merged back to master.
When the master is stable in terms of features to go live we make a release branch of it.
Any release ...
- 3,640