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 what I have locally
is the same as what's hosted.
So far, I'm ok with those steps.
However, now that I've worked in the branch, I've decided that this
approach is the one to take and want to merge it back to the master. I get:
thufir@dur:~/NetBeansProjects/MudSocketClient$
thufir@dur:~/NetBeansProjects/MudSocketClient$ git branch
* 001try_in_thread
master
thufir@dur:~/NetBeansProjects/MudSocketClient$
thufir@dur:~/NetBeansProjects/MudSocketClient$ git merge master
Already up-to-date.
thufir@dur:~/NetBeansProjects/MudSocketClient$
And yet, the two versions are quite different:
thufir@dur:~/NetBeansProjects/MudSocketClient$
thufir@dur:~/NetBeansProjects/MudSocketClient$ git checkout master
Switched to branch 'master'
thufir@dur:~/NetBeansProjects/MudSocketClient$
thufir@dur:~/NetBeansProjects/MudSocketClient$ ll src/mudsocketclient/
total 12
drwxrwxr-x 2 thufir thufir 4096 Dec 12 03:03 ./
drwxrwxr-x 3 thufir thufir 4096 Dec 12 03:03 ../
-rw-rw-r-- 1 thufir thufir 1563 Dec 12 03:03 Weather.java
thufir@dur:~/NetBeansProjects/MudSocketClient$
thufir@dur:~/NetBeansProjects/MudSocketClient$ git checkout
001try_in_thread
Switched to branch '001try_in_thread'
thufir@dur:~/NetBeansProjects/MudSocketClient$
thufir@dur:~/NetBeansProjects/MudSocketClient$ ll src/mudsocketclient/
total 12
drwxrwxr-x 2 thufir thufir 4096 Dec 12 03:03 ./
drwxrwxr-x 3 thufir thufir 4096 Dec 12 03:03 ../
-rw-rw-r-- 1 thufir thufir 1466 Dec 12 03:03 Telnet.java
thufir@dur:~/NetBeansProjects/MudSocketClient$
And that's fine. I changed the name of the class in the branch, and
that's reflected.
Now, how do I get the changes I made in the branch back into the master
branch?
thanks,
Thufir
--
You received this message because you are subscribed to the Google Groups "Git for
human beings" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
For more options, visit https://groups.google.com/groups/opt_out.
