09:43] Derek Ackley: highlights_store drops has like 5 tags as the latest commit with no branch? how do I find out which branch is the current branch? I think these are being submitted wrong into stash
[09:44] Sam Hetrick: 7.x-2.x is the branch
[09:45] Derek Ackley: thanks... Shouldn't we be committing branches and not tags for every commit. having the branch then tagged?
[09:46] Sam Hetrick: there's many ways you could do it, but ultimately - tag or no tag - you need to commit back to the branch.
[09:46] Sam Hetrick: It appears that the commits are going to the 7.x-2.x branch as they should.
[09:46] Derek Ackley: ok - the git log was very confusing
[09:55] Derek Ackley: my repo says it is current, but the 4 tags ahead of my repo/ basically how do I get those changes into my local?
[09:55] Steve Lefevre: `git pull`?
[09:55] Derek Ackley: everything says it is up to date
[09:55] Steve Lefevre: what does git branch say?
[09:55] Steve Lefevre: you might need to check out those branches
[09:57] Nick Furr: `git checkout 7.x-2.x`
`git pull origin 7.x-2.x`
[09:57] Nick Furr: if that doesnt work `git remote -v`
[09:57] Derek Ackley: says already up to date
[09:57] Nick Furr: make sure your origin is right
[09:57] Sam Hetrick: might need to fetch before that. I'd also create a feature branch (if you haven't already) just so you don't lose whatever changes you have
[09:57] Steve Lefevre: paste output of git tag
[10:11] Derek Ackley: apparently my fork syncing wasn't syncing
[10:11] Steve Lefevre: frustrating :S
[10:11] Derek Ackley: very...
[10:11] Steve Lefevre: int he past I've had to uncheck and check that box
[10:12] Steve Lefevre: to get it to sync
[10:26] Nick Furr: if you develop directly on a branch that has sync enabled (7.x-2.x) it will fall out of sync and the feature will reject
[10:26] Nick Furr: feature branch FTW!
[10:26] Sam Hetrick: always be branching
[10:26] Steve Lefevre: A.B.B.
[10:26] Steve Lefevre: A- Always
[10:26] Steve Lefevre: B- Be
[10:26] Steve Lefevre: B- Branching
[10:26] Sam Hetrick: I WANT A TSHIRT WITH THIS
[10:26] Sam Hetrick: DO IT
[10:27] Derek Ackley: I don't open up a file without branching..... The tagging however causes confusion! Should we also A.B.T
[10:28] Sam Hetrick: the tagging didn't mess up syncing
[10:28] Sam Hetrick: its possible that stash just hated you today
[10:28] Derek Ackley: not in this particular instance - but it made my log look weird
[10:28] Brian Weaver: can you describe how it made the log look 'weird'?
[10:28] Brian Weaver: is this command line, or sourcetree?
[10:29] Sam Hetrick: again, as long as you commit to the branch, tags are just extra
[10:29] Sam Hetrick: (for your use case)
[10:31] Sam Hetrick: though, if we're not using them in the makefile, I'm all for not tagging
[10:32] Sam Hetrick: but no matter why we use them, as long as folks go back to the canonical branch and development happens on a feature branch, most times things will be fine.
[10:32] Sam Hetrick: and when they're not and fork syncing breaks, just fix it.