How to use source control
-
I've actually had that situation and resolved it relatively easily with Git. I think Git makes that very easy using the
git checkoutcommand. 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.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.
-
NOT. 1. Check out the dev branch. 2. Start working on a new feature 3. You're asked to fix a bug on the same project not related to the feature you're adding. 4. Manually copy the code to somewhere else that you've been working on for the new feature. 5. Revert your local branch back to the master version 6. Fix the bug. 7. Check in the change. 8. Manually copy back the code that you were working on for the new feature. 9. Manually add back in the bug fix. 10. Keep working on the feature. Yes, this is actually what I was told as "how to do it" because branching can get too complicated. :laugh: :rolleyes: :sigh:
Latest Article - Building a Prototype Web-Based Diagramming Tool with SVG and Javascript Learning to code with python is like learning to swim with those little arm floaties. It gives you undeserved confidence and will eventually drown you. - DangerBunny Artificial intelligence is the only remedy for natural stupidity. - CDP1802
-
"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.
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. :)
-
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.
-
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.
Latest Article - Building a Prototype Web-Based Diagramming Tool with SVG and Javascript Learning to code with python is like learning to swim with those little arm floaties. It gives you undeserved confidence and will eventually drown you. - DangerBunny Artificial intelligence is the only remedy for natural stupidity. - CDP1802
-
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.
Latest Article - Building a Prototype Web-Based Diagramming Tool with SVG and Javascript Learning to code with python is like learning to swim with those little arm floaties. It gives you undeserved confidence and will eventually drown you. - DangerBunny Artificial intelligence is the only remedy for natural stupidity. - CDP1802
-
NOT. 1. Check out the dev branch. 2. Start working on a new feature 3. You're asked to fix a bug on the same project not related to the feature you're adding. 4. Manually copy the code to somewhere else that you've been working on for the new feature. 5. Revert your local branch back to the master version 6. Fix the bug. 7. Check in the change. 8. Manually copy back the code that you were working on for the new feature. 9. Manually add back in the bug fix. 10. Keep working on the feature. Yes, this is actually what I was told as "how to do it" because branching can get too complicated. :laugh: :rolleyes: :sigh:
Latest Article - Building a Prototype Web-Based Diagramming Tool with SVG and Javascript Learning to code with python is like learning to swim with those little arm floaties. It gives you undeserved confidence and will eventually drown you. - DangerBunny Artificial intelligence is the only remedy for natural stupidity. - CDP1802
I had a gent tell me he had 5 years of SVN experience. I said, great... Then please start using branches and get off the main branch. He replied... "I've never done branching"... to which I said... "then you have about 30 minutes of SVN experience, repeatedly, over 5 years!" He eventually said... "Wow, I wish I would have known about branches before..." ROTFLMAO!
-
NOT. 1. Check out the dev branch. 2. Start working on a new feature 3. You're asked to fix a bug on the same project not related to the feature you're adding. 4. Manually copy the code to somewhere else that you've been working on for the new feature. 5. Revert your local branch back to the master version 6. Fix the bug. 7. Check in the change. 8. Manually copy back the code that you were working on for the new feature. 9. Manually add back in the bug fix. 10. Keep working on the feature. Yes, this is actually what I was told as "how to do it" because branching can get too complicated. :laugh: :rolleyes: :sigh:
Latest Article - Building a Prototype Web-Based Diagramming Tool with SVG and Javascript Learning to code with python is like learning to swim with those little arm floaties. It gives you undeserved confidence and will eventually drown you. - DangerBunny Artificial intelligence is the only remedy for natural stupidity. - CDP1802
You need to roll your own so it does what you want and you know how to use it.
-
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. :)
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.
-
Marc Clifton wrote:
- 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.
Way easier :-\
if(!string.IsNullOrWhiteSpace(_signature))
{
MessageBox.Show("This is my signature: " + Environment.NewLine + _signature);
}
else
{
MessageBox.Show("404-Signature not found");
}LOL
-
NOT. 1. Check out the dev branch. 2. Start working on a new feature 3. You're asked to fix a bug on the same project not related to the feature you're adding. 4. Manually copy the code to somewhere else that you've been working on for the new feature. 5. Revert your local branch back to the master version 6. Fix the bug. 7. Check in the change. 8. Manually copy back the code that you were working on for the new feature. 9. Manually add back in the bug fix. 10. Keep working on the feature. Yes, this is actually what I was told as "how to do it" because branching can get too complicated. :laugh: :rolleyes: :sigh:
Latest Article - Building a Prototype Web-Based Diagramming Tool with SVG and Javascript Learning to code with python is like learning to swim with those little arm floaties. It gives you undeserved confidence and will eventually drown you. - DangerBunny Artificial intelligence is the only remedy for natural stupidity. - CDP1802
I work contract, so I have worked with a bunch of different source control systems. By far the easiest has been TFS, and it has gotten better with the years. Issues I have found with other systems: 1) Shelf Set does not exist, and this is so easy to fix bugs in your system, so partial check-ins, etc 2) It seems impossible to have two versions on your system at one time, so cannot easily work on two features at once, and cannot get somebody else's version and do whatever you need with it. 3) The only way to get (git) you code updated when somebody else has posted changes is to commit your changes. I have not yet found a product that works better with Visual Studio than TFS, and find it amazing that all these companies continue to use crappy source control which they even pay for, which significantly impact developer productivity...typical penny wise pound foolish or maybe just plain foolish.
-
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.
Latest Article - Building a Prototype Web-Based Diagramming Tool with SVG and Javascript Learning to code with python is like learning to swim with those little arm floaties. It gives you undeserved confidence and will eventually drown you. - DangerBunny Artificial intelligence is the only remedy for natural stupidity. - CDP1802
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.
-
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.
Latest Article - Building a Prototype Web-Based Diagramming Tool with SVG and Javascript Learning to code with python is like learning to swim with those little arm floaties. It gives you undeserved confidence and will eventually drown you. - DangerBunny Artificial intelligence is the only remedy for natural stupidity. - CDP1802
-
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).
-
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.
-
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.
-
I work contract, so I have worked with a bunch of different source control systems. By far the easiest has been TFS, and it has gotten better with the years. Issues I have found with other systems: 1) Shelf Set does not exist, and this is so easy to fix bugs in your system, so partial check-ins, etc 2) It seems impossible to have two versions on your system at one time, so cannot easily work on two features at once, and cannot get somebody else's version and do whatever you need with it. 3) The only way to get (git) you code updated when somebody else has posted changes is to commit your changes. I have not yet found a product that works better with Visual Studio than TFS, and find it amazing that all these companies continue to use crappy source control which they even pay for, which significantly impact developer productivity...typical penny wise pound foolish or maybe just plain foolish.
1. use git stash (but I rarely use it as I commit locally every 15 minutes or so). 2. that's what branches are for. if you need to work on someone else's branch, have them push it to the server and then pull the branch locally to work on it (do this as often as necessary while both of you work on it or pull directly from their local). 3. merge from [branch you want changes from] to your branch (you should be committing often anyway, so committing should not be an issue).
-
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 work contract, so I have worked with a bunch of different source control systems. By far the easiest has been TFS, and it has gotten better with the years. Issues I have found with other systems: 1) Shelf Set does not exist, and this is so easy to fix bugs in your system, so partial check-ins, etc 2) It seems impossible to have two versions on your system at one time, so cannot easily work on two features at once, and cannot get somebody else's version and do whatever you need with it. 3) The only way to get (git) you code updated when somebody else has posted changes is to commit your changes. I have not yet found a product that works better with Visual Studio than TFS, and find it amazing that all these companies continue to use crappy source control which they even pay for, which significantly impact developer productivity...typical penny wise pound foolish or maybe just plain foolish.
One thing I appreciate about TFS is that it is visually and verbally descriptive, particularly when it comes to merges. Merge "from". Merge "to". Thank you. How hard is that for Git and several of the front ends I've tried to actually be clear about that?
Latest Article - Building a Prototype Web-Based Diagramming Tool with SVG and Javascript Learning to code with python is like learning to swim with those little arm floaties. It gives you undeserved confidence and will eventually drown you. - DangerBunny Artificial intelligence is the only remedy for natural stupidity. - CDP1802
-
1. use git stash (but I rarely use it as I commit locally every 15 minutes or so). 2. that's what branches are for. if you need to work on someone else's branch, have them push it to the server and then pull the branch locally to work on it (do this as often as necessary while both of you work on it or pull directly from their local). 3. merge from [branch you want changes from] to your branch (you should be committing often anyway, so committing should not be an issue).
I just find it extremely awkward compared to TFS. TFS seems to be almost trivial to use, which is not true with the others. I am more interested in learning to be a better programmer than learning what I consider a badly designed tool when I really don't need to learn much to use TFS. Everything has always seemed pretty obvious.
