messy branches!

I don’t know how to express this in words, so you get pictures. 

I work all my branches the same way. I have the following:
   InternalTesting
   ExternalTesting

   Master

   {featuere-branch}

The first three are also stored remote and shared. 

Most of the time, looking at the history, it is very neat and easy to follow and understand. But I have one project that went crazy. I don’t know why or how to correct it. But as is, it is just a mess. Here are two pics. the first is what most look like and the second is the mess. 

Can someone help me understand what is going on and if there is a way to clean it up - what is it? 

This is just a guess because I can’t see the whole history and I don’t know much about your process or environment, but it appears that someone did the following:

  1. Created a branch
  2. Made a single commit on that branch
  3. Merged that branch into internalTesting
  4. Deployed internalTesting to whatever test environment you use (this might be automated)
  5. Waited for tests to finish
  6. Saw tests were still broken
  7. Repeated steps 2 through 6 until tests were no longer broken

I would assume that this is because testing whatever they were changing is infeasible to impossible to test locally.

On the other hand, I could be totally wrong :grinning:

1 Like