So I have following situation in github.
I created a fresh branch from the
mainbranch
and named asuserstory1
I pushed my changes in branch
userstory1
and raised a pull request to my colleagueHe saw that folder structure was not correct so renamed my code folder in
mainbranch
. So now I have foldermycode
onuserstory1
branch whereas onmainbranch
its namedmy-code
. My changes on branchuserstory1
are yet to be merged tomainbranch
Of course now automatic merge of my pull request is not possible on
mainbranch
What is the best way to handle this situation? I want to use the same pull request for merging changes on branch userstory1
to mainbranch
What I have thought of is to get the code from mainbranch
onto my machine and commit it to branch userstory1
but not sure if same pull request can be used if I do more commits on userstory1
branch
There are many ways First Is
checkout userstory1
Now merge mainbranch
It will show you the conflict. To see clearly type
and pay attention for the files that are changed on both side.
Now resolve the conflict manually and then type
If you want to add message it's upto you other wise it will ammend to previous one
then push the code
assuming origin as remote url.
No need to do anything with pull-request it will automatically updated.