That was a type: my first cause is to MAKE changes in a different directory. I want to stay clear of changing master at all times, If I can, and if it is even in the slightest way necessary (ie. stuff that can break things).
But merging BACK into Master is still the most difficult thing there is. It is unclear to me. The Atlassian tutorial spends very little time on merging. I don't know how to do it, or how to do it well. I am not sure how to rebase onto the master in such a way that I can see what is going on. Maybe it is just rebase <branch> --onto master and I can try... and it doesn't work. It also left me with a detached HEAD and not knowing how to recover from that. -- 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 git-users+unsubscr...@googlegroups.com. For more options, visit https://groups.google.com/d/optout.
