Does anyone know a consultant who could help train us a bit on Git? I thought I understood most of the basics, but something things get very confusing and we need some help sorting things out.
For example today we created a new branch and made some commits to it. But it shows that master is "identical" to this new branch, but in fact it should be "1 commit behind'. So it's as if whatever we commit to the new branch is also being committed to the branch called master. Maybe rebase has something to do with this? I read that rebase can "split" commits between branches: http://gitready.com/intermediate/2009/01/31/intro-to-rebase.html I'm tempted to just delete my repo and start tracking these files from scratch because something it no longer makes sense to me. But would be nice if we can just straighten it out, so I don't have to lose my revision history. If I compare "master" and with my new branch ("search-label-issue") it shows the difference between them (one .css file was changed). So it knows that are different yet it says they are "identical" (instead of "1 commit behind") in the SmartGit branch switcher. That's screwed up! Cheers! -- 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/-/BPUTUSpI49kJ. 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.
