troubleshooting Question

What is "base-branch?"

Avatar of Bruce Gust
Bruce GustFlag for United States of America asked on
Git
6 Comments1 Solution161 ViewsLast Modified:
Recently I did a pull request and my team lead came back and said that it looked as though I had based my branch of "master" rather than "code-cleanup."

"master" is three months old. "code-cleanup" is the one that everyone on my team has been merging into.

Thankfully, I was able to verify that I had created my branch / most recent work off of "code-cleanup," but I couldn't understand why my team lead would've thought that my pull request was referring to a branch that was so obviously behind the eight ball.

Here's a few screenshots to give you a visual:

Here's "master." This is the original body of code that we all branched off of as part of our collective effort to clean things up...

master branch
Here's "code-cleanup." This is the branch that has all of our individual efforts represented in one "new" block of code...

code-cleanup
This is the branch that I created off of "code-cleanup" that has my most recent changes...

activity-stream
When I made my pull request, this is how it looks - bear with me, because I think I see what changed but I want to understand what changed...

pull-request
When you double click on that pull request, you see this:

allgood
What I have in the "box" looks like some activity that was done on my behalf by a team member. He reassigned my base branch to "code-cleanup" as opposed to "master."

Without even know what that is, intuitively I can see something that explains why my team lead would've thought that I had based my changes off of "master."

But what happened when my associate changed my "base branch."

  • What did that do?
  • How was it done?
  • Is it something I should've done myself?
  • Should my team lead have been able to see what my associate noticed and changed?
  • How do I prevent this from happening in the future?

Thanks!
Join the community to see this answer!
Join our exclusive community to see this answer & millions of others.
Unlock 1 Answer and 6 Comments.
Join the Community
Learn from the best

Network and collaborate with thousands of CTOs, CISOs, and IT Pros rooting for you and your success.

Andrew Hancock - VMware vExpert
See if this solution works for you by signing up for a 7 day free trial.
Unlock 1 Answer and 6 Comments.
Try for 7 days

”The time we save is the biggest benefit of E-E to our team. What could take multiple guys 2 hours or more each to find is accessed in around 15 minutes on Experts Exchange.

-Mike Kapnisakis, Warner Bros