I've read about what a merge conflict is:
http://githowto.com/resolving_conflicts
but I'm not sure that's the situation. Whether I checkout the master
branch or the new branch, they both give their status as:
nothing added to commit...
and all commits have been pushed to github so that
On Thu, 12 Dec 2013 03:05:14 -0800
thufir hawat.thu...@gmail.com wrote:
[...]
thufir@dur:~/NetBeansProjects/MudSocketClient$
thufir@dur:~/NetBeansProjects/MudSocketClient$ git branch
* 001try_in_thread
master
thufir@dur:~/NetBeansProjects/MudSocketClient$
On Thu, 12 Dec 2013 03:40:24 -0800 (PST)
THUFIR HAWAT hawat.thu...@gmail.com wrote:
Why didn't it say that there were conflicts? I mean, the files were
totally different.
Because your history looked something like this (I suppose):
-A-B-C = master
\-D-E = 001try_in_thread
so as you
On Thu, 12 Dec 2013 03:40:24 -0800 (PST)
THUFIR HAWAT hawat.thu...@gmail.com wrote:
Why didn't it say that there were conflicts? I mean, the files were
totally different.
And one more aspect to this, which I forgot to point out...
Git *would* take differences in files when doing a merge *if*
I'm aware of git, but have not used it myself. Now I want to set up a
static blog site on AWS S3, using [TBD tool, Jekyll seems promising...] to
pump out the HTML etc.
My preference would be a Git workflow that accommodates my heavy (but not
exclusive) use of ChromeOS. That implies (I
I'm using github and when prompted for the password to the ssh keys (a
pop-up window in Linux), I entered the wrong password. Now, when I try
to use the keys, I get remote hung up because, presumably, it's not
sending the keys, or the password won't unlock the keys (?).
Here's what it looks
