How to “merge” a git branch when I forgot to create a master branch
I've recently switched to Git from CVS/SVN and so far enjoying it. However, in my latest dev cycle, I forgot a critical step in creating a master branch before creating my dev branch.
In my normal cycle, I have my trunk (stable code), and then my maintenance branch in which we perform maintenance releases. Within that maintenance branch, we have our dev branches for individual bugs.
Usually, my maintenance branch follows my versions. So in my trunk I'll have my Major versions (ie: ver 1, ver 2, ver 3). Then my maintenance branch (ie: 1.1, 2.1, 2.2, etc). Then within my maintenance branch, my dev branch for this release (ie: 1.2.1, 2.1.3, etc).
In my last cycle, I was working on 2.2.1. My last release was 2.1.8. I accidentally branched from my 2.1 branch and did work on it, instead of first creating a 2.2 branch. Now, when I want to merge my changes back, I don't have a 2.2 branch to merge back into.
What I "should" have done was merge my 2.1 branch back into the trunk (v2) and then branched 2.2 from the trunk and then 2.2.1 from the 2.2 branch.
Now that I do not have a 2.2 branch and my 2.2.1 branch incorrectly comes off 2.1, how do I save myself?
There has been a lot of dev work done in 2.2.1 already.
|-2.2.1 <---- wrong place!!!
Should have been:
Our development/release cycle works like this: Developer creates a feature branch, implements a feature Developer indicates feature is ready for acceptance testing (UAT) Tester deploys feature branch
I done several commits in master branch and next merge them to dev branch. I want to create branch from specific commit in dev branch which is first committed in master branch. I use commands git chec
I know how to synchronize two branches (i.e. the gh-pages branch is updated everytime the master is updated). What I would like is to sinchronize only a certain directory of master to the gh-pages b
I have a git master in my SourceTree, and I want to create a branch on another computer. How I can do this? (Master = Remote, in the same network)
I have a repository in git. I made a branch, then did some changes both to the master and to the branch. Then, tens of commits later, I realized the branch is in much better state than the master, so
Possible Duplicate: Change the current branch to master in git I have two branch in my git repo: master seotweaks (created originally from master) I created seotweaks with the intention of quick
I'm using the Git Flow branching model, with a master branch and a develop branch. I'm working on a major new release, so my develop branch is wildly different from my master branch. This creates a
I just wanted to create branch using git bash so anyone can give me guidance how to do it?
I made 5 commits to Master branch when bug hunting on a private project and pushed them to the remote origin (my own private vps). Then I saw that commits 4 and 5 were going to cause trouble elsewhere
I am working on a google maps project on android and i need to update the maps to the new v2 version, thus ive created a branch with git add -u git commit -m 'xxxyyyzzz' git checkout -b MapsV2 Then
I merge branch A with branch B, and delete branch A. When I tried the same thing in remote repo: delete branch A, I got an error like this: fajar@FAJAR-PC /e/project minggu ini/ProjectTesis (master) $
I create a git repository via git init. I do git branch. Problem: I was expecting to see one branch listed, the Master branch. But nothing is listed. Why?
I have a master branch and a master new branch. The master new is a result of a mistake that was needed to be fixed quickly. I know it is a very bad practice to do that but thats were I am now.
I have 3 branch in my git repo: master, stand and develop. For each feature i create new brach from develop. After feature done, i'll merge it branch into develop (with --no-ff option). For example,
I have checked out gh-pages branch. I try git merge master and I receive the following error: The following untracked working tree files would be overwritten by merge: ... Please move or remove them
Issue I merged a branch in a master not updated at last commit. What I do I merged a branch in master git merged BRANCHNAME Conflicts Automatic merge failed; fix conflicts and then commit the result.
I have master branch with initial state: touch file git add file git commit -m initial Then I did some changes: echo 123 >> file git commit -am feature1 which really belong to a feature
In Master Git there is Core-src.A and Feature1-src.B. Then a new Branch is created and in that branch Core-src folder is deleted and also a new file is created Feature1-src.New. . Now when we merge th
I have cloned an empty repository. I have an empty master branch. I need to branch out to a dev branch and start my development code there. Later I might not even need the master branch but some stabl
Situation: I have a topic branch which has been squashed into master. I then added some additional commits to the topic branch and want to merge these additional commits into master. Is there any way
Is it possible to merge other branch into another branch? For example, I'm in branch1 and want to pull remote/develop into develop branch and then merge develop into current branch1. What am I doing i
Here is my situation: A master \ \-- B --- C --- D topic I want to merge topic branch to master but only to commit C without changes introduced in commit D. I know I can create new branch from topic
I created a branch notmaster to commit as well as push some changes. When I was finished with that branch, I merged the changes back into master, pushed them out, and then deleted the local notmaster.
I was looking for a way to automate the process of updating my master branch (the released version) for a project. Basically only two branches will exist on the origin repository (develop and master..
So far, I have cloned an empty git repo, and created a new branch with 'git checkout -b branchname'. My understanding is that typing 'git branch' should now give me some output like * mybranch master
I'm trying to switch from a feature branch to master without losing my changes, and so I'm trying to git stash and then switch to master, but master is moving to my feature branch. Basically: <feat
Lets say I make a branch branch1 from master. I make a bunch of changes on branch1, and a few changes on master. If I merge branch1 into master, will all the changes to master be removed and will th
I just created a new git repository and only did one commit. Now I do not see a master branch. These are roughly the commands I ran. git init git checkout -b dev (I made some changes to the monitored
I have two branches dev and master. I want my dev branch to be completely overwritten by master branch as I know master is latest. How can I do that using Tortoise GIT UI? I tried to do merge using To
When you run git pull on the master branch, it typically pulls from origin/master. I am in a different branch called newbranch, but I need to run a command that does a git pull from origin/master into
I have master and a branch off of master called develop. I made a lot of changes in develop branch such that there are a lot of conflicts with master. I would like to force merge develop into master s
I have a local branch tracking the remote/master branch. After running git-pull and git-log, the log will show all commits in the remote tracking branch as well as the current branch. However, because
I was initially in master branch, then I create a development branch and use that branch by: git branch development git checkout development After that, I start to make changes in my project on devel
I just need to delete a master branch and is proving to be hard. I just want to clean that branch out and start new. I am deteting from dev branch. I want master on git hub to be clean. # git push or
I branched from master and created a branch called extra_work. Then I made lots of changes to master which included removing some files as well. Later now when I tried to merge the branch 'extra_work'
When I git pull from a branch that is not master, I get following response. You asked me to pull without telling me which branch you want to merge with, and 'branch.not_master.merge' in your configur
Let's say I have a master branch and a project branch, both on our remote origin. Work is mainly being done in the project branch, but occasionally a bug fix needs to go into master so it can be deplo
How can I create a new branch and push it to the remote and then share it with the other developers? I'm following the below steps. What's wrong, missing? Developer A creates the following: git branch
I have a local branch of a project (configUpdate) that I've forked from somebody else's project and I've done a load of changes on it and would like to merge the changes they've made in to my local
I am looking for a way to merge my master branch into my test branch, while keeping my commits in test on top (after master is merged in). What's the appropriate way of doing it?
I created a feature branch off master and worked for a long while. I then fetched the latest master branch commits and rebased my feature branch commits on top of it. Then I merged feature into
I have a local git repository with two remotes ('origin' is for internal development, and 'other' is for an external contractor to use). The master branch in my local repository tracks the master in '
I work in develop branch. Sometimes, when I want to push changes to origin, git say, that there are some changes in origin/master branch. How to pull changes from remote master to local master without
My current process is: git checkout dev make changes and commits (& push to development branch on origin occasionally) git checkout master git merge dev git push origin master git checkout dev
I've done merge some-branch into master, but gets confilcts. How to undo this ? git checkout master git merge some-branch ... CONFLICTS :(
I get this error when I try to pull from remote repository using Egit team>pull The current branch is not configured for pull No value for key branch.master.merge found in configuration
I am using forked repository of MainRepo.in my forked repository I have a branch name as Demo2.In this branch I have 2 files names are file1and file2. Know I want to merge total files from Demo2 to me
For a while, I worked in with Git in this unusual way: git checkout -b feature123 tiny edit, commit, repeat git checkout master git merge --squash feature123 Use output of git log --oneline to popula
Whats the best practice to restrict master branch or ensuring that your existing code is safe? I'm going to hire someone to work on my existing code, how do I ensure that they won't mess up the code I
Suppose I was on master branch and created a new branch: git checkout -b feature_branch I started to work on feature_branch, and at some point I would like to merge my changes to master using rebase.