3 ms·
Not at all. Where did you come up with that? That would merge in any commits in master not already in experimental and the next command would fail because a bra
by fr0sty 15y ago
Not at all. Where did you come up with that? That would merge in any commits in master not already in experimental and the next command would fail because a branch 'master' already exists.
To do what you are describing you would do this (or something similar:
git checkout master; git merge experimental
- watmough 15y agoThanks, obviously I'm missing some concept somewhere.
- rahoulb 15y agoThe checkout command moves you off the experimental branch and back onto the master branch. The merge command then takes the commits in experimental that aren't in master and puts them into master.
- watmough 15y agoThanks, I think I may have been misusing git branch [some name] I'll take a look at some of the suggested tutorials again. Thanks all. That said, I pretty much do straight-ahead main-line development, so this isn't a huge problem right now. I do most of my development after midnight, so there isn't a huge cognitive headroom left...