branching-and-merging Questions
7
Solved
We will be attempting a work flow in github where every ticket is a branch off of master.
After the ticket is complete, the work is merged into staging where regression and integration tests are pe...
Sunfast asked 23/1, 2013 at 17:40
2
Solved
I have a local branch features that I based off of my local master to add some stuff in my code. I am now ready to merge those back into master , however, the state of the remote master branch has ...
Chatelain asked 31/10, 2017 at 7:11
12
After pushing I've been seeing this message at remote repository:
1 commit behind master.
This merge has conflicts that must be resolved before it can be committed.
To manually merge these changes...
Disapprobation asked 6/12, 2015 at 14:20
2
Solved
My team uses perforce for version control.
There have been a lot of additions in the branch that I am currently working on, as compared to the Release branch.
Now, I just fixed a known bug in the ...
Unsaid asked 7/5, 2013 at 11:18
23
Solved
How do I move my recent commits on master to a new branch, and reset master to before those commits were made? e.g. From this:
master A - B - C - D - E
To this:
newbranch C - D - E
/
master A - B...
Staffard asked 27/10, 2009 at 3:7
2
Solved
All commits that have been pushed to the develop branch indicate that they were verified.
To merge everything from develop to master, I decided to click a button Rebase and merge. (I didn't want to...
Roehm asked 17/7, 2020 at 8:25
17
Solved
A new branch from master is created, we call it test.
There are several developers who either commit to master or create other branches and later merge into master.
Let's say work on test is taki...
Kist asked 9/4, 2011 at 0:1
3
My main branch has some files that have different codes from the same file of development branch. The development branch is the one that has the correct version of these files but when I am trying ...
Rafter asked 21/12, 2014 at 14:40
3
Solved
I have recently moved from Mecurial to TFS 2012 to take care of source control. So far I really like it, but I am just stuck on one aspect of it, so I was hoping someone on here can help me.
Let's...
Lxx asked 6/8, 2013 at 12:35
3
Solved
Another developer has deleted and rebuilt a remote branch called "development" which I already have a checked out copy. He did this delete and rebuild to remove some cruft from it. Which is great.
...
Pressure asked 1/3, 2013 at 16:50
4
I have a master branch which is supposed to only get commits by merging either a "release/xxxxx" branch into it or by merging a "hotfix/xxxxx" branch into it.
The pipeline for a release branch bui...
Happenstance asked 23/1, 2020 at 11:8
5
Solved
At work, we're now using GitHub, and with that GitHub flow. My understanding of GitHub flow is that there is a master branch and feature branches. Unlike git flow, there is no develop branch.
This...
Osteen asked 22/5, 2020 at 15:25
4
Solved
I've just started using GitLab, and have created a set of issues, in order to keep an overview of what needs to be done for my application. I was wondering if it was possible to create a branch fro...
Macronucleus asked 8/4, 2017 at 14:13
7
Solved
I checked a load of files in to a branch and merged and then had to remove them and now I'm left with a large .pack file that I don't know how to get rid of.
I deleted all the files using git rm -r...
Mauriac asked 15/6, 2012 at 12:2
4
Solved
What I'm really looking for would be the equivalent of a lightweight database snapshot that could be further modified.
The database could be huge, but the snapshot itself should be tiny and ...
Hecht asked 11/5, 2012 at 17:4
33
Solved
I just encountered a problem when merging a branch into master in git. First, I got the branch name by running git ls-remote. Let's call that branch "branch-name". I then ran git merge branch-name ...
Illbehaved asked 31/5, 2013 at 17:41
1
The company I work for is using gitflow.
We follow a branch-per-feature approach where individual features are implemented, tested and then PR'd into develop. When it comes time for a release we c...
Idiopathy asked 12/12, 2017 at 21:24
8
Solved
Using Perforce Server 2012.2/538478, how can I unshelve files from the trunk to another branch?
When trying to do it, I get:
//filename... (not mapped to your workspace view)
In Perforce 2013, ...
Earache asked 6/1, 2014 at 11:20
2
Solved
I created a pull request, my approver requested some changes, i marked those resolved and clicked on re-request button with out seeing if the merging was blocked or unblocked. So now to unblock mer...
Shade asked 27/5, 2020 at 22:24
8
Solved
I've got two branches that are fully merged together.
However, after the merge is done, I realise that one file has been messed up by the merge (someone else did an auto-format, gah), and it would ...
Elyot asked 21/11, 2008 at 1:50
8
Solved
I've got two branches that are fully merged together.
However, after the merge is done, I realise that one file has been messed up by the merge (someone else did an auto-format, gah), and it would ...
Wertz asked 21/11, 2008 at 1:50
8
Solved
I've got two branches that are fully merged together.
However, after the merge is done, I realise that one file has been messed up by the merge (someone else did an auto-format, gah), and it would ...
Bramble asked 21/11, 2008 at 1:50
5
Solved
When I have two branches in Hg repo, how to merge only one file with another branch, without having all other files from changeset merged?
Is it possible to merge only certain files, instead of wh...
Scandic asked 3/7, 2009 at 11:9
8
Solved
I have a branch named BranchA from master. I have some changes in BranchA (I am not going to merge changes from BranchA to master).
Now I have created another branch from master named BranchB.
How ...
Copenhaver asked 5/12, 2016 at 13:47
2
Solved
I am learning git-flow and I just did git flow feature finish <feature-name>, which merged my feature branch to develop and removed it.
Instead of this, I want to push the feature branch to ...
Maiolica asked 19/11, 2012 at 8:28
1 Next >
© 2022 - 2024 — McMap. All rights reserved.