GIT Question for company
Sorry if this is a really noob question, but I don't want to bother my manager and also I've never worked as a team on a Git project and never ran into this issue...
I have coded a branch1 on my company GIT repository.
After I have finished coding it, it is pending work review, so they haven't integrated it into master yet.
Now I have been told to code a new branch2.
However, now there are updates on main that are not in the branch1, and updates in the branch1 that are not in main.
I need both of these changes to update what I am doing in branch2.
What solution do I have apart from asking them to finish the pending work review and integrate branch1 to main and then pulling the new main from my side?
I have coded a branch1 on my company GIT repository.
After I have finished coding it, it is pending work review, so they haven't integrated it into master yet.
Now I have been told to code a new branch2.
However, now there are updates on main that are not in the branch1, and updates in the branch1 that are not in main.
I need both of these changes to update what I am doing in branch2.
What solution do I have apart from asking them to finish the pending work review and integrate branch1 to main and then pulling the new main from my side?