It’s mostly a quirk of how git checkout works internally. The Git folks have a tendency to let implementation dictate interface. The end result is that after git checkout with –ours or –theirs, if you want to resolve the conflict, you must also git add the same paths: git checkout –ours — path/to/file git add … Read more
Don’t do the rebase and you’re set. Simply merge your bugfix branch into each branch you need it (master)$ git checkout -b bugfix # do bug fix here (bugfix)$ git commit -a -m ‘Fixed bug.’ (bugfix)$ git checkout master (master)$ git merge bugfix (bugfix)$ git checkout experimental (experimental)$ git merge bugfix When doing the rebase … Read more
You should add another remote for my-app-prod named prod-heroku (replace GIT_URL with the Git URL that you can find in the settings page of my-app-prod in heroku): git remote add prod-heroku GIT_URL git push prod-heroku production:master This will push your local branch production to the remote branch master in prod-heroku so my-app-prod will get deployed … Read more
Assuming you want to overwrite all the contents of InitialPomChanges with what is in develop (i.e. you want the contents of InitialPomChanges to exactly match develop), do the following: git checkout InitialPomChanges git checkout develop . #copies the contents of develop into the working directory git commit -am “Making InitialPomChanges match develop” This will make … Read more
Another answer edited in by someone who thought it’s the best (and it looks good): git branch -r –merged origin/master | grep -v master | grep “origin/” | cut -d “https://stackoverflow.com/” -f 2- | xargs -n 20 git push –delete origin Explanation: git branch -r –merged origin/master -r/–remotes list the remote-tracking branches. –merged origin/master only … Read more
Read e.g. this explanation http://git-scm.com/book/en/Git-Branching-Remote-Branches First let’s clarify some git terminology: fetch: getting contents (or updates) from a remote repo pull: fetch (as above) and merge in one step The original poster did not mention merging, so I might guess in proper git terminology he might even have wanted to ask “git fetch all branches … Read more
By squashing the merge, you’ve created a commit which has the effect of, but is not really, a merge. That is, the working tree has the modifications you’d expect, but the metadata doesn’t: crucially, the commit doesn’t have two parents (one on master and one on alt) and therefore subsequent merges can’t figure out the … Read more
The asterisks show where something was committed: e1193f8, 5a09431 and 30e367c were committed to the left branch (yielding a | on the right branch) whereas 420eac9 was committed to the right branch (yielding a | on the left branch). And that is how 420eac9 differs from the rest: it’s the only commit to the right … Read more
Update: Using Git Switch All of the information written below was accurate, but a new command, git switch has been added that simplifies the effort. If daves_branch exists on the remote repository, but not on your local branch, you can simply type: git switch daves_branch Since you do not have the branch locally, this will … Read more
These steps should do the trick: Get the sha’s needed: git log <sha1> is the commit right before the merge <sha2> is the last commit on develop before you started working on the feature git checkout develop git checkout -b feature/<feature-name> git reset <sha1> –hard git checkout develop git reset <sha2> –hard Push your feature … Read more