Granny's Programming Pearls
"inside of every large program is a small program struggling to get out"
JavaRanch.com/granny.jsp
The moose likes IDEs, Version Control and other tools and the fly likes Cannot merge online and local repository Big Moose Saloon
  Search | Java FAQ | Recent Topics | Flagged Topics | Hot Topics | Zero Replies
Register / Login


Win a copy of Spring in Action this week in the Spring forum!
JavaRanch » Java Forums » Engineering » IDEs, Version Control and other tools
Bookmark "Cannot merge online and local repository" Watch "Cannot merge online and local repository" New topic
Author

Cannot merge online and local repository

sid smith
Ranch Hand

Joined: May 27, 2014
Posts: 50
I am new to Git/source control and I followed my book to create a copy of a local repository on bitbucket, clone it to a local folder and merge the folder with my local repository. I am not able to merge the repo despite following all instructions successfully. In the image below, I should be getting origin/master per my book. But, I get nothing. How do I fix this ?

Here is the image -

Jeanne Boyarsky
author & internet detective
Marshal

Joined: May 26, 2003
Posts: 30758
    
156

Does that tool have a log that might tell you what wrong? IF not, you might try the git command line so you can get an actual error message.

Unfortunately, the problem count be anything without the error message.


[Blog] [JavaRanch FAQ] [How To Ask Questions The Smart Way] [Book Promos]
Blogging on Certs: SCEA Part 1, Part 2 & 3, Core Spring 3, OCAJP, OCPJP beta, TOGAF part 1 and part 2
 
I agree. Here's the link: http://aspose.com/file-tools
 
subject: Cannot merge online and local repository