master branch and 'origin/master' have diverged, how branches to 'undiverge'?

Posted by Frank on Stack Overflow See other posts from Stack Overflow or by Frank
Published on 2010-03-16T05:05:40Z Indexed on 2010/03/16 5:16 UTC
Read the original article Hit count: 405

Filed under:

git

|

branches

Hi Guys, I'm kind of a git Noob and somehow I got my master and my origin/master branch to diverge. I actually don't want them to be diverged. How can I view these differences and 'merge' them?

© Stack Overflow or respective owner

Related posts about git

git pull gives error: 401 Authorization Required while accessing https://git.foo.com/bar.git

as seen on Stack Overflow - Search for 'Stack Overflow'
My macbook pro is able to clone/push/pull from the company git server. My cent 6.3 vm gets a 401 error git clone https://git.acme.com/git/torque-setup "error: The requested URL returned error: 401 Authorization Required while accessing https://git.acme.com/git/torque-setup/info/refs As a work… >>> More
Can't install git on Ubuntu 12.10

as seen on Ask Ubuntu - Search for 'Ask Ubuntu'
I'm following these instructions to install git on my laptop: http://git-scm.com/download/linux When I do: $ sudo apt-get install git-core This is what my terinal shows: Reading package lists... Done Building dependency tree Reading state information... Done The following packages… >>> More
Git apache : unable to push via http

as seen on Server Fault - Search for 'Server Fault'
I have to setup a server which can allow http vcs management (such as git and svn). svn support works well, but I have some trouble with git. Actual configuration: CentOS 5 Apache 2.2.8 Git 1.7.4.1 The /etc/httpd/conf/httpd.conf content: ServerTokens OS ServerRoot "/etc/httpd" PidFile run/httpd… >>> More
git on HTTP with gitolite and nginx

as seen on Server Fault - Search for 'Server Fault'
I am trying to setup a server where my git repo would be accessible with HTTP(S). I am using gitolite and nginx (and gitlab for web interface but I doubt it makes any difference). I have searched the whole afternoon and I think I'm stuck. I have think I have understood that nginx needs fcgiwrap… >>> More
Redmine git integration - issue in accessing git from redmine but not from external git client

as seen on Server Fault - Search for 'Server Fault'
I have setup redmine integration with apache as described in the redmine documentation. I have a /git path accessible with auth and /git-private accessible only to redmine. When I clone the repository through /git path, I get the up-to-date repo. But when I try to view it in redmine repo viewer, I… >>> More

Related posts about branches

Why isn't pyinstaller making me an .exe file?

as seen on Stack Overflow - Search for 'Stack Overflow'
I am attempting to follow this guide to make a simple Hello World script into an .exe file. I have Windows Vista with an AMD 64-bit processor I have installed Python 2.6.5 (Windows AMD64 version) I have set the PATH (if that's the right word) so that the command line recognizes Python I have installed… >>> More
Branching and Merging Improvements in TFS2010

as seen on Geeks with Blogs - Search for 'Geeks with Blogs'
Introducing the concept of “first class branches” is a significant improvement as part of the 2010 release with respect to version control. Not only does it help to distinguish between folders and branches, but it enables branch visualizations. Let us see improvements in detail. · In TFS2008… >>> More
Generate automated builds for source code from multiple branches using Team Foundation Server and Te

as seen on Code Project - Search for 'Code Project'
Generate automated builds for source code from multiple branches using Team Foundation Server and Team Builds >>> More
git-svn cannot create a branch to follow SVN branching

as seen on Stack Overflow - Search for 'Stack Overflow'
Hello everybody, I'm struggling with the following issue. When I continue fetching revisions from SVN with git svn fetch I'm getting the following error (removed https to be able to post question): *Found possible branch point: somecompany.com/product/trunk = somecompany.com/product/branches/deep/branches/product-001… >>> More
Capistrano, Mercurial and branches

as seen on Stack Overflow - Search for 'Stack Overflow'
It is my understanding that although Mercurial has support from branches, the community generally clone repos instead of creating branches. Similar to the Darcs model, unlike the Git model. I'm deploying a Ruby on Rails app with Capistrano and there I'd like to separate the production from the development… >>> More