|
NOT.
- Check out the dev branch.
- Start working on a new feature
- You're asked to fix a bug on the same project not related to the feature you're adding.
- Manually copy the code to somewhere else that you've been working on for the new feature.
- Revert your local branch back to the master version
- Fix the bug.
- Check in the change.
- Manually copy back the code that you were working on for the new feature.
- Manually add back in the bug fix.
- Keep working on the feature.
Yes, this is actually what I was told as "how to do it" because branching can get too complicated.
  
|
|
|
|
|
That's what I would do when I first encountered git. Sunshine would just elephanting dissapear when I would change branches.
But then, I was used to PVCS where I controlled the file until I was done with it. Everybody else had to keep their grubby hands off.
Do I love git now? No, but I can tolerate it.
|
|
|
|
|
Marc Clifton wrote: Check out the dev branch.Start working on a new featureYou're asked to fix a bug on the same project not related to the feature you're adding.Manually copy the code to somewhere else that you've been working on for the new feature.Revert your local branch back to the master versionFix the bug.Check in the change.Manually copy back the code that you were working on for the new feature.Manually add back in the bug fix.Keep working on the feature.
Way easier 
Rules for the FOSW ![ ^]
if(!string.IsNullOrWhiteSpace(_signature))
{
MessageBox.Show("This is my signature: " + Environment.NewLine + _signature);
}
else
{
MessageBox.Show("404-Signature not found");
}
|
|
|
|
|
|
There is a shelf-feature in VS 
Bastard Programmer from Hell 
If you can't read my code, try converting it here[^]
"If you just follow the bacon Eddy, wherever it leads you, then you won't have to think about politics." -- Some Bell.
|
|
|
|
|
Eddy Vluggen wrote: There is a shelf-feature in VS
Yes, and a stash (not sure if that's the git equivalent though) but nobody uses it.
|
|
|
|
|
I have, obviously 
Bastard Programmer from Hell
If you can't read my code, try converting it here[^]
"If you just follow the bacon Eddy, wherever it leads you, then you won't have to think about politics." -- Some Bell.
|
|
|
|
|
You should "upgrade" them to Visual Source Safe so they can see what they are doing 
Hogan
|
|
|
|
|
That's one of the main reasons I forced myself to learn git.
Branching can get complicate using svn and others but it's no reason to not do it.
Everyone has a photographic memory; some just don't have film. Steven Wright
|
|
|
|
|
In TFS you can shelve changes, which is better than branching. Does Git have something similar? I don't know.
But your description brought a smile to face.
|
|
|
|
|
|
When using git, there is no reason not to branch. Besides, I commit every 15 minutes or so while working, so can't just stash (git equiv. to shelve) and work on something else. Just make a branch (takes about 10 seconds or less) and fix it there. Merging is generally not an issue in git (I have only had one merge conflict in the last month on a team of 7 devs and used to have many in TFS).
|
|
|
|
|
Merge conflicts usually only occur if the same file was worked on by more than one person, prior to check in/merge. We do our best not to let this happen, and "that" is what controls merge conflicts, not the software.
|
|
|
|
|
If you like to manually control merge conflicts, that's great, but I would rather let the software be better at merging and only get involved when there is truly a bad conflict. There are always certain files that are frequently modified (configuration files, common UI, etc.) and if your software can intelligently merge the code for you, then I welcome it. I have used almost every source control software out there in my 30+ years of development (some of them as a build automation engineer) and git gives a better development experience than most (ok, I prefer Mercurial, but the industry chose git and I use github for collaboration on my private projects).
|
|
|
|
|
I've actually had that situation and resolved it relatively easily with Git.
I think Git makes that very easy using the git checkout command.
I'm sure you know that already, but it is quite amazing how you can switch branches in Git so easy.
Much easier than Subversion where I would often start working on the change, only to remember later I needed to branch first.
|
|
|
|
|
"git checkout" just about sums up GIT in a nutshell.
It's a wonderfully easy way to do something but it has an utterly non-intuitive and inappropriate name.
Sometimes it almost feels like the only naming rule in GIT is "be as obtuse as possible."
98.4% of statistics are made up on the spot.
|
|
|
|
|
You're checking out the branch, I don't see the issue with the name? Not that it's an amazing name, many non-Microsoft names do leave a lot to be desired ("Blame" springs to mind), but it's not the worst name either.
|
|
|
|
|
PeejayAdams wrote: It's a wonderfully easy way to do something but it has an utterly non-intuitive and inappropriate name.
Yes, I totally agree with that.
The name of that command is completely non-intuitive to the level of stupidity.
edit
I guess that could be because I used subversion for so long where you :
branch
switch
which seems somewhat intuitive.
However, Git is so far superior to subversion I am willing to put up with bad naming. 
modified 18-Apr-18 9:41am.
|
|
|
|
|
Yes, I guess I'm also still a little bit stuck in a Subversion and Mercurial mind-set.
98.4% of statistics are made up on the spot.
|
|
|
|
|
raddevus wrote: Much easier than Subversion where I would often start working on the change, only to remember later I needed to branch first.
I have a "Clippy" VS add-in that when I start to work on the dev branch it pops up and says "It seems you're working directly on dev, do you need help creating a new branch first?"
I don't, that was a joke. I so wish it wasn't though.
|
|
|
|
|
F-ES Sitecore wrote: I don't, that was a joke. I so wish it wasn't though
Haha, while I was reading the first part, I was like..."Does this person really have something that runs and does that type of thing? Amazing." Good thing you told me you don't because I was really believing it.
Probably because I want that too. It's such a pain when you forget to branch first.
|
|
|
|
|
If it's git you are working with I can recommend SourceTree, it makes doing most git things way easier (for me at least) than the command line.
|
|
|
|
|
Jacquers wrote: If it's git you are working with I can recommend SourceTree,
TFS. And it's not the technology that is the issue, it's the workflow that people said I should use when I asked the question, how do you handle working on A when a bug request comes in for B? And the reason I asked was, sadly, I was afraid the answer was as described.
|
|
|
|
|
Yes...TFS seems to be the best. Not sure about relative front end cost, but the only reason I can see to justify using something else is if it is free, and even then it is probably a stupid move.
|
|
|
|
|
git is free.
Microsoft uses git for much of their development.
git has quite a bit of integration with Visual Studio.
|
|
|
|
General 
News 
Suggestion 
Question 
Bug 
Answer 
Joke 
Praise 
Rant 
Admin 
Submit an article or tip
