On Wed, Dec 20, 2017 at 5:40 PM, Cristian Achim <brancoliticus@xxxxxxxxx> 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 > > while in usb_subfolder. Can't remember the immediate output, but it > included a part about two repos having no commits in common. Would > have been wiser for git to just error out with a message that in one > of the folders there is not git repository. > > At all times > > git status > > in home_subfolder gives > > branch master > Working directory clean > > This is so stupid considering the circumstances. > > Doing again > > git pull home_subfolder > > at all times from usb_folder now returns U in front of 2 files in > home_folder and A in front of another file and then says > > Pull is not possible because you have unmerged files > > Had the bright idea to do > > git clone home_subfolder > > from the usb_subfolder because of my worries going away when > > git status > > in home_subfolder conforted me that there must be nothing bad about > the situation. Therefore I suspect that now doing > > git pull usb_subfolder > > from home_subfolder will do the same broken result as above. > > 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. Hi. While I'm sure you'll still find some fault with git's UI could you please: 1) Try to see if the latest git version (or some approximation) fixes some of this, as you said you're on 1.9.1 which was released in 2014, there's been a lot of UI work since then, including some that by my reading of your mail should address some of your concerns 2) It would be really useful if you could distill the complaints you have down to some sequence of commands to run, preferably just a small shellscript with comments saying "the message at this point is bad for such-and-such a reason". I may have just misread what you said (or maybe it's since been fixed), but per my reading we're already doing some of what you've pointed out we should be doing, and if not maybe that's because I'm not imagining how you're running git exactly, a reproducible recipe would really help. Thanks.
