Why doesn't this work? Most definitely gridBagLayout and master are different.
thufir@dur:~/NetBeansProjects/SwingNNTP$ thufir@dur:~/NetBeansProjects/SwingNNTP$ git branch * gridBagLayout master mvc sscce sscceDefaultTableModelIsMutable sscceSimple thufir@dur:~/NetBeansProjects/SwingNNTP$ thufir@dur:~/NetBeansProjects/SwingNNTP$ thufir@dur:~/NetBeansProjects/SwingNNTP$ git merge gridBagLayout master Already up-to-date. Yeeah! thufir@dur:~/NetBeansProjects/SwingNNTP$ thufir@dur:~/NetBeansProjects/SwingNNTP$ git commit -a # On branch gridBagLayout # Untracked files: # (use "git add <file>..." to include in what will be committed) # # build.xml # build/ # manifest.mf # nbproject/private/private.xml nothing added to commit but untracked files present (use "git add" to track) thufir@dur:~/NetBeansProjects/SwingNNTP$ Incidentally, trying to post through gmane failed silently. thanks, Thufir -- You received this message because you are subscribed to the Google Groups "Git for human beings" group. To view this discussion on the web visit https://groups.google.com/d/msg/git-users/-/CJVGtET9xtIJ. To post to this group, send email to git-users@googlegroups.com. To unsubscribe from this group, send email to git-users+unsubscr...@googlegroups.com. For more options, visit this group at http://groups.google.com/group/git-users?hl=en.
