The Lounge is rated Safe For Work. If you're about to post something inappropriate for a shared office environment, then don't post it. No ads, no abuse, and no programming questions. Trolling, (political, climate, religious or whatever) will result in your account being removed.
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.
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.
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,
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.
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!
Last Visit: 5-Dec-20 5:54 Last Update: 5-Dec-20 5:54