All Questions
Tagged with git-extensions git-merge
5 questions
1
vote
1
answer
208
views
Stash the difference between current branch and master to apply it to an old commit
how can I stash the difference between current branch and master to apply it to an old commit, in other words I should apply a new feature in current version(Master) and old version(old Master commit ...
- 109
3
votes
1
answer
762
views
Git extensions--why am I seeing multiple labels for the same branch?
So I thought that I did a simple merge from my feature branch back down into master. However, in Git Extensions it's showing labels a couple of revisions back in a faded style (see image). What the ...
- 4,940
0
votes
2
answers
939
views
Bring Git branches in sync
We have a Master branch and a Develop branch for our repo. We are supposed to check-in (commit, push) to our Develop branch and then merge that with our Master branch. Then a build is run for the ...
- 149
0
votes
0
answers
200
views
Is it possible for two branches to conflict on a file when one branch doesn't even change that file?
Our department deploys our test server by taking master and merging in + locally committing each branch (one branch per task). The deploy script will stop if it runs into a merge conflict, or if after ...
- 8,155
1
vote
1
answer
128
views
Merge 2 branches in git ignoring branch in between?
I want to merge a branch into another branch selectively & then merge another branch ignoring 1 branch in between. How do I do this with Git? I am using Git Extensions for visual studio.
- 13k