git help | Java Community | Help. Code. Learn. | Page 1

severe mango Apr 28, 2023, 1:57 AM

#

Guys so. I have two branches from a main branch. Doing dev work in one. Then start the other while first gets reviewed. Some of the code from the first branch I need to build on in second. So I merge first branch into my second. Now on the PR for second branch to main it is showing the first branch changes as well as this branch? The first branch is now in main

vagrant epochBOT Apr 28, 2023, 1:57 AM

#

⌛ This post has been reserved for your question.

Hey @severe mango! Please use /close or the Close Post button above when you're finished. Please remember to follow the help guidelines. This post will be automatically closed after 300 minutes of inactivity.

TIP: Narrow down your issue to simple and precise questions to maximize the chance that others will reply in here.

torn iron Apr 28, 2023, 4:42 AM

#

pull main into your dev branch resolve conflicts and then merge

#

@severe mango

#git help