Some combo of git revert and git stash would work

I think there's a couple ways that could work. If it's the last commit you can "git reset HEAD^" and then stash, change branches, and apply the stash.

Or you could "git cherry-pick --no-commit" the change on the other branch, commit it separately, and then revert on master, I think.

I’d probably checkout a new branch based on the branch with the faulty commits. Go back to master, git revert. Merge new branch to feature branch or just make new branch the feature branch.

I don't know what git cherry pick really does and at this point I'm afraid to ask

I had to do it recently. You can take specific commits from one branch to merge in another.

I had to cherry pick like 100 commits from our old version to a new, refactored version. It was awful.

To be a little more specific: cherry-pick brings a commit from another branch into your current branch, by applying the patch from that commit into a new commit on your current branch (with generally the same metadata as the old commit, depending on command-line options).

(I add the specific-ness because "merge" has a specific git meaning and cherry-picking is not a merge, it targets individual commits)

Yea, you’re right, sorry

hmm I don't see an immediate decent use case for that so I don't feel that bad I guess.

A common one is:
- make release branch off master
- bug is discovered and fixed in master
- you want the bugfix in release

Answer: cherry-pick the fix.

Nice - that could come in handy.

jmakin, I would recommend either being a developer or a PM but not both. Pick one and run with it.

Also pick developer unless you enjoy always taking the fall when projects go bad.

Not really an option

I'm gonna get them to pay for my certification course

That means being stuck there for months. This place is not boosting your resume the way you think it is.

GTFO bro!

I said from the beginning I’d reevaluate after a year - it’s nearly been a year. I didnt want to stay less than two years at my first job. We’ll see how it goes

It’s one thing to stay at a dev job for a while, it’s another to leave a non-dev job early.

The agreement I basically came to with my boss was this:

- They need to firmly define my role to the entire company and make it clear what my responsibilities are

- PMI certification (already started)

- Let me decide how I'm going to do things/which tools I'm going to use/which methodologies (they agreed)

- Bring me in on all business related meetings/critical communications/customer engagements (they agreed)

- Allow me to work on tech things if I have bandwidth, so I can develop my tech skills as well so I can develop my career path as I see fit (they agreed)

It's still a good opportunity even though it sucks a lot. I have a lot of freedom here and I've spent like 8 months building strong relationships with some EXTREMELY difficult personalities and I don't want to toss that away. I get paid better than average for my experience, and probably another raise or two coming my way. The future of the company is not 100% doomed so there is potential upside. I still believe in the product.

I can suck it up for a year and see what happens, I'm not a quitter. My tolerance and capacity for misery is pretty high, anyone who's followed my blog would know that.

I did let my boss know I'm not really happy though. Don't really care if that was a mistake or not. he said as far as career path goes, he sees a lot more management in me than anything else, I think he was being honest.

Understand what your bosses role is. He wants to keep you on the team. Take what he says with a grain of salt. Why do you care about getting certified in a career that doesn’t make you happy? Why do you care about the future of a company you are unhappy at and whose current career path is one that will continue to make you unhappy.

You deserve happiness dude, this will be one of the easiest job transitions you’ll make in your career. You should take advantage of it.

Only other option is leaving. Cert is mostly for the training course so I can have somewhat of an idea what I’m doing.

The crap I am going to have to do is extremely unpopular. That’s what makes me the most miserable.

The company told us that the Product manager that left was fired - i dont get that sense from him at all. He’s been emailing me actually, I get the sense he wants to poach me for something else. He’s been probing me about some business ideas he has.

Anyway it’s super demoralizing. I just nearly singlehandedly delivered a massive deliverable to Intel who’s partnering with us right now. What I delivered has the potential to drum up business for the next year and a half, and since i built it i know it’s bulletproof. And you want me managing full time now? (They said 75/25 but it’s gonna be 100%)

Oh well. If it’s gonna be this way gotta just suck it up and play hardball with the difficult people because **** has to change.

Almost every project manager I've had has been a communications major or poli sci or something. The point is anyone who's detail-oriented and the right personality can learn to do it. This puts a ceiling on your future earnings and on your replaceability.

IE - it might suck to lose you after you've been a PM for a while. But nothing remotely like how bad it would suck to lose the grumpy old greybeard who built most of the system. That dude can pretty much come in and piss on the boss's desk and keep his job.

Not long after I started my previous job - one of the senior devs went on a curseword-laden email tirade to the whole department about this ****ty automated test environment that was spitting out all kinds of false bugs. I was wondering what was going to happen to him, instead I saw boss after boss kissing up to him trying to make things right. That's power.

It's great to be a PM for a while to fill in imo - and the perspective you get will be invaluable if you go back to being a dev. But just be aware you'll never be able to piss on the boss's desk as a PM.

And you're always the first one to get pissed on when the project goes south. Worst case scenario you wind up as the impossible middleman between battling bosses. I have a buddy working for a startup right now who that's happening to. One C-level is trying to get the other C-level to bend to his wishes - via the PM. They refuse to deal with each other directly. Obviously it's not going well and he's stressed out beyond belief. He's 100% to be the first let go when this project hits the skids - no matter how well or how poorly he performs at his job. That happens way less often when you're a dev.

jmakin, sounds like you are invaluable to your company as a sort of project manager. get paid for it. request some absurd raise, like whatever high end PM's make.

but it sounds like you want to be a dev? if so, its easy to spin the current work that you are doing as the work of a dev/tech lead. so, in the mean time polish up your resume and ship it all over town/country seeking the role of tech lead/tech architect.

in my experience, companies love leadership and you have that in spades.

Suzzer you’re right - but also, you have to consider how strong my job prospects are. Even though the ceiling’s low I could basically get hired anywhere, including non-tech positions. And the field is also growing rapidly in tech as well (so is everything else i understand)

I honestly don’t know which way my career is going to go from here and I could go either way sometimes. I know my end goal is to have my own start up so this experience is pretty valuable for that. But it isnt fun at all.

I know for my resume i could display my tech accomplishments if i had to. So idk it doesnt feel that bad of a spot overall, i just hate it and the next year’s gonna be miserable.

I personally don’t think the ceiling on project management is anything like what Suzzer describes. For one, it’s a set of skills that’s pretty applicable across a wide range of disciplines. For another, it’s often a route to product management (and at some places used almost interchangeably). Product management has a very high ceiling.

From your description though it sounds like your company is good at the tech side of things and terrible at the project and product side of things. So it seems like a poor place to learn those things if that’s what you’re interested in.

One other thing, the vast majority of developers couldn’t care less when their PM tells them they use to code or have a technical background. Even in cases when that background is impressive it usually is written off as stale / irrelevant. I’ve worked with a lot of excellent engineers who went a non technical route and it’s always interesting to hear new people discount their experience (often wrongly so). I just mention this because if you actually want to go the non technical route I think you gain little by the small technical experience you’d get here. If you enjoy it a little pick it up as a hobby while still committing your career in a single direction.