i have a simple question, if i have a branch called a
then i checked out another branch from that one, called b
, i made some changes in b
, commited, then pushed it, and merged b
back into a
.
now a
gets the changes locally on my machine but not in the github website, and a
doesn't consider the changes that i've merged as a change in branch a
so i can't manually commit then push to a
so that it reflects on the github site. how to solve that ?
i tried to change the merged file then push manually, but why would i need to change the file after the merge if i already made all the changes before merging.
CodePudding user response:
and merged b back into a.
If you merged it online through PR (Pull Request), then you would need to refresh a locally.
If you merge it locally, then it depends on how b was merge to a, especially if "a
has no changes to commit and push".
git switch a
git merge b
git push