Skip to content
  • Categories
  • Recent
  • Tags
  • Popular
  • World
  • Users
  • Groups
Skins
  • Light
  • Cerulean
  • Cosmo
  • Flatly
  • Journal
  • Litera
  • Lumen
  • Lux
  • Materia
  • Minty
  • Morph
  • Pulse
  • Sandstone
  • Simplex
  • Sketchy
  • Spacelab
  • United
  • Yeti
  • Zephyr
  • Dark
  • Cyborg
  • Darkly
  • Quartz
  • Slate
  • Solar
  • Superhero
  • Vapor

  • Default (No Skin)
  • No Skin
Collapse
Code Project
  1. Home
  2. The Lounge
  3. we don't like to create a lot of branches, it confuses things and creates more work

we don't like to create a lot of branches, it confuses things and creates more work

Scheduled Pinned Locked Moved The Lounge
javascriptpythoncombeta-testingannouncement
32 Posts 19 Posters 0 Views 1 Watching
  • Oldest to Newest
  • Newest to Oldest
  • Most Votes
Reply
  • Reply as topic
Log in to reply
This topic has been deleted. Only users with topic management privileges can see it.
  • M Offline
    M Offline
    Marc Clifton
    wrote on last edited by
    #1

    Knowing this, such was the reply when I asked if I could create a feature branch so I can separate what I'm adding to the dev branch, which I want to keep separate in case there are bugs fixes that need to be made and I don't want the code for the new feature making it's way into the dev->qa release process yet. :omg: :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

    C L D B K 8 Replies Last reply
    0
    • M Marc Clifton

      Knowing this, such was the reply when I asked if I could create a feature branch so I can separate what I'm adding to the dev branch, which I want to keep separate in case there are bugs fixes that need to be made and I don't want the code for the new feature making it's way into the dev->qa release process yet. :omg: :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

      C Offline
      C Offline
      CodeWraith
      wrote on last edited by
      #2

      Hey, it's their shop, their product and also their rules. Or, as I often say, may they learn to be careful what they ask for. They might get it.

      I have lived with several Zen masters - all of them were cats. His last invention was an evil Lasagna. It didn't kill anyone, and it actually tasted pretty good.

      M 1 Reply Last reply
      0
      • C CodeWraith

        Hey, it's their shop, their product and also their rules. Or, as I often say, may they learn to be careful what they ask for. They might get it.

        I have lived with several Zen masters - all of them were cats. His last invention was an evil Lasagna. It didn't kill anyone, and it actually tasted pretty good.

        M Offline
        M Offline
        Marc Clifton
        wrote on last edited by
        #3

        CodeWraith wrote:

        Hey, it's their shop, their product and also their rules.

        Yeah, I've never dealt will with stupid.

        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

        C C B 3 Replies Last reply
        0
        • M Marc Clifton

          CodeWraith wrote:

          Hey, it's their shop, their product and also their rules.

          Yeah, I've never dealt will with stupid.

          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

          C Offline
          C Offline
          CodeWraith
          wrote on last edited by
          #4

          Then it's best not to argue with them and let them deal with it once it happens. Just make sure that they can't deny that this was the way they wanted to have it when they come crying.

          I have lived with several Zen masters - all of them were cats. His last invention was an evil Lasagna. It didn't kill anyone, and it actually tasted pretty good.

          C M 2 Replies Last reply
          0
          • M Marc Clifton

            Knowing this, such was the reply when I asked if I could create a feature branch so I can separate what I'm adding to the dev branch, which I want to keep separate in case there are bugs fixes that need to be made and I don't want the code for the new feature making it's way into the dev->qa release process yet. :omg: :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

            L Offline
            L Offline
            Lost User
            wrote on last edited by
            #5

            do it the microsoft way, only have a feature branch. and the up-sell: even fixing a bug is a feature ms release notes often read that way (as if there was never a bug): - they seldom say, "we fixed the broken x" - rather, "now you can do x too," perhaps adding, "a feature not fully implemented in the last release."

            Signature ready for installation. Please Reboot now.

            1 Reply Last reply
            0
            • M Marc Clifton

              Knowing this, such was the reply when I asked if I could create a feature branch so I can separate what I'm adding to the dev branch, which I want to keep separate in case there are bugs fixes that need to be made and I don't want the code for the new feature making it's way into the dev->qa release process yet. :omg: :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

              D Offline
              D Offline
              DRHuff
              wrote on last edited by
              #6

              A little git of knowledge is a dangerous thing! :-D

              M 1 Reply Last reply
              0
              • M Marc Clifton

                Knowing this, such was the reply when I asked if I could create a feature branch so I can separate what I'm adding to the dev branch, which I want to keep separate in case there are bugs fixes that need to be made and I don't want the code for the new feature making it's way into the dev->qa release process yet. :omg: :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

                B Offline
                B Offline
                BillWoodruff
                wrote on last edited by
                #7

                Hi Marc, A bit confusing: what does "knowing this" refer to ? In this case, their rules are their loss. I would attribute the fact it (evidently) bothers you to your deep commitment to your "craft:" I can only hope the recognition of that drive for excellence (and innovation !) in your work here balances out the emotional equation ! your student and friend, Bill

                «... thank the gods that they have made you superior to those events which they have not placed within your own control, rendered you accountable for that only which is within you own control For what, then, have they made you responsible? For that which is alone in your own power—a right use of things as they appear.» Discourses of Epictetus Book I:12

                1 Reply Last reply
                0
                • M Marc Clifton

                  Knowing this, such was the reply when I asked if I could create a feature branch so I can separate what I'm adding to the dev branch, which I want to keep separate in case there are bugs fixes that need to be made and I don't want the code for the new feature making it's way into the dev->qa release process yet. :omg: :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

                  L Offline
                  L Offline
                  Lost User
                  wrote on last edited by
                  #8

                  Now I think it depends what "a lot of branches" means. Personally I prefer (try to avoid) also not to have more than 3 :)

                  It does not solve my Problem, but it answers my question

                  1 Reply Last reply
                  0
                  • M Marc Clifton

                    Knowing this, such was the reply when I asked if I could create a feature branch so I can separate what I'm adding to the dev branch, which I want to keep separate in case there are bugs fixes that need to be made and I don't want the code for the new feature making it's way into the dev->qa release process yet. :omg: :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

                    K Offline
                    K Offline
                    KarstenK
                    wrote on last edited by
                    #9

                    you can branch from your branch. And do it locally. :suss:

                    Press F1 for help or google it. Greetings from Germany

                    M 1 Reply Last reply
                    0
                    • K KarstenK

                      you can branch from your branch. And do it locally. :suss:

                      Press F1 for help or google it. Greetings from Germany

                      M Offline
                      M Offline
                      Marc Clifton
                      wrote on last edited by
                      #10

                      KarstenK wrote:

                      you can branch from your branch. And do it locally.

                      I failed to mention that this is using TFS, which doesn't (as far as my google-fu took me) support local branching.

                      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

                      J S 2 Replies Last reply
                      0
                      • D DRHuff

                        A little git of knowledge is a dangerous thing! :-D

                        M Offline
                        M Offline
                        Marc Clifton
                        wrote on last edited by
                        #11

                        DRHuff wrote:

                        A little git of knowledge is a dangerous thing!

                        And a whole lot of TFS is Too F***** Stupid to support local branches. ;) I could be wrong--egg on face time if I am--but my Google Fu did not indicate that TFS supports local branching.

                        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

                        M 1 Reply Last reply
                        0
                        • M Marc Clifton

                          CodeWraith wrote:

                          Hey, it's their shop, their product and also their rules.

                          Yeah, I've never dealt will with stupid.

                          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

                          C Offline
                          C Offline
                          Clifford Nelson
                          wrote on last edited by
                          #12

                          You're very lucky. Almost everyday I see stupid. Hey we got Trump didn't we.

                          P S 2 Replies Last reply
                          0
                          • C CodeWraith

                            Then it's best not to argue with them and let them deal with it once it happens. Just make sure that they can't deny that this was the way they wanted to have it when they come crying.

                            I have lived with several Zen masters - all of them were cats. His last invention was an evil Lasagna. It didn't kill anyone, and it actually tasted pretty good.

                            C Offline
                            C Offline
                            Clifford Nelson
                            wrote on last edited by
                            #13

                            Last project I saw them use abstract classes, and could not understand why they did not use interfaces since they did not do anything that could not be done with an interface. They even had abstract properties that were simple properties created in the derived class.

                            L 1 Reply Last reply
                            0
                            • M Marc Clifton

                              DRHuff wrote:

                              A little git of knowledge is a dangerous thing!

                              And a whole lot of TFS is Too F***** Stupid to support local branches. ;) I could be wrong--egg on face time if I am--but my Google Fu did not indicate that TFS supports local branching.

                              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

                              M Offline
                              M Offline
                              Marco Bertschi
                              wrote on last edited by
                              #14

                              TFS does, but only if you access it with Git. We're using that combination at work, and it does the job nicely.

                              I only have a signature in order to let @DalekDave follow my posts.

                              M 1 Reply Last reply
                              0
                              • M Marco Bertschi

                                TFS does, but only if you access it with Git. We're using that combination at work, and it does the job nicely.

                                I only have a signature in order to let @DalekDave follow my posts.

                                M Offline
                                M Offline
                                Marc Clifton
                                wrote on last edited by
                                #15

                                Marco Bertschi wrote:

                                TFS does, but only if you access it with Git.

                                Hah! That's an idea. I'll have to explore that a bit. ;)

                                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

                                M 1 Reply Last reply
                                0
                                • M Marc Clifton

                                  Marco Bertschi wrote:

                                  TFS does, but only if you access it with Git.

                                  Hah! That's an idea. I'll have to explore that a bit. ;)

                                  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

                                  M Offline
                                  M Offline
                                  Marco Bertschi
                                  wrote on last edited by
                                  #16

                                  You may start here[^]. TFS has come a long way, and it's really become a great piece of software - Not only for source control, but also for managing work.

                                  I only have a signature in order to let @DalekDave follow my posts.

                                  1 Reply Last reply
                                  0
                                  • C Clifford Nelson

                                    You're very lucky. Almost everyday I see stupid. Hey we got Trump didn't we.

                                    P Offline
                                    P Offline
                                    Paul Sanders the other one
                                    wrote on last edited by
                                    #17

                                    Yes, how did that happen?

                                    Paul Sanders http://www.alpinesoft.co.uk

                                    S C 2 Replies Last reply
                                    0
                                    • M Marc Clifton

                                      KarstenK wrote:

                                      you can branch from your branch. And do it locally.

                                      I failed to mention that this is using TFS, which doesn't (as far as my google-fu took me) support local branching.

                                      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

                                      J Offline
                                      J Offline
                                      Jorgen Andersson
                                      wrote on last edited by
                                      #18

                                      Since it isn't a distributed versioning system it can't. Then again, I'm not convinced it supports global branching either.

                                      Wrong is evil and must be defeated. - Jeff Ello

                                      M 1 Reply Last reply
                                      0
                                      • M Marc Clifton

                                        KarstenK wrote:

                                        you can branch from your branch. And do it locally.

                                        I failed to mention that this is using TFS, which doesn't (as far as my google-fu took me) support local branching.

                                        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

                                        S Offline
                                        S Offline
                                        Stuart Dootson
                                        wrote on last edited by
                                        #19

                                        Use [git-tfs](https://github.com/git-tfs/git-tfs) and make a local branch in the resulting git repo? Yes, it says it's not actively maintained, but that's onl;y since six months ago... Is TFS like SVN in the way it manages branches? If that's the case, I can kind of understand not wanting too many branches - I always had trouble and pain when managing SVN branches (a long, long time ago...thankfully!)

                                        Java, Basic, who cares - it's all a bunch of tree-hugging hippy cr*p

                                        1 Reply Last reply
                                        0
                                        • C CodeWraith

                                          Then it's best not to argue with them and let them deal with it once it happens. Just make sure that they can't deny that this was the way they wanted to have it when they come crying.

                                          I have lived with several Zen masters - all of them were cats. His last invention was an evil Lasagna. It didn't kill anyone, and it actually tasted pretty good.

                                          M Offline
                                          M Offline
                                          MikeTheFid
                                          wrote on last edited by
                                          #20

                                          CodeWraith wrote:

                                          Just make sure that they can't deny that this was the way they wanted to have it when they come crying.

                                          Yeah, see, the problem is, if they're not smart enough to get it in the first place, "I told you so" won't make them get it when the excrement impacts the air movement device. Righteousness is never a catalyst for changing minds. :)

                                          Cheers, Mike Fidler "I intend to live forever - so far, so good." Steven Wright "I almost had a psychic girlfriend but she left me before we met." Also Steven Wright "I'm addicted to placebos. I could quit, but it wouldn't matter." Steven Wright yet again.

                                          C 1 Reply Last reply
                                          0
                                          Reply
                                          • Reply as topic
                                          Log in to reply
                                          • Oldest to Newest
                                          • Newest to Oldest
                                          • Most Votes


                                          • Login

                                          • Don't have an account? Register

                                          • Login or register to search.
                                          • First post
                                            Last post
                                          0
                                          • Categories
                                          • Recent
                                          • Tags
                                          • Popular
                                          • World
                                          • Users
                                          • Groups