On Wed, Dec 20, 2017 at 8:40 AM, Cristian Achim <brancoliti...@gmail.com> wrote: > All I will do is paste the stackoverflow question below. It covers the > commands I made in chronological order and the way I would have > expected git to behave differently. > > So I did > > git pull home_subfolder >
This by itself should be attempting to pull from a remote named home_subfolder. Can you show the output of "git remote" and also clearly explain with details the layout of what the folders are and what is or is not a repository? I can't really make heads or tails of your problem without more details. > I do not want to resolve merge conflicts because git doesn't error out > with a sane message of the situation when it should. I just want to > get the home_subfolder and usb_subfolder repositories state to where > it was before my breakage generating git pull and git clone commands. > > Ubuntu 14.04 64 bit, git 1.9.1. > > Thank you for your time. So you have home_subfolder and usb_subfolder which are repositories? Are they submodules within a parent project? Are they simply folders? Were you trying to merge the two together? Without knowing more of what you intended to do, vs what you did, and without more information about the setup it's not really possible to understand the situation or what broke. >From the looks of it, I think you might have tried to do something like try to pull from usb_subfolder directly into the home_subfolder. Are these two repositories nested? ie: you have "home_subfolder" as "/home/subfolder" and you have usb_subfolder as "/home/subfolder/usb/subfolder"? That might explain why git pull would interpret such a command as a path from which to do a file based pull... Thanks, Jake
