【发布时间】:2022-12-01 15:04:28
【问题描述】:
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.
【问题讨论】:
-
did you not push after the merge?
-
i didn't push into branch
abut i would do it if i can, that's the problem after i mergebintoa,ahas no changes to commit and push so i have to make further unnecessary edits in it if i want to push. -
ahas no changes to commit but it still has new commits that haven't been pushed yet (the ones you merged).git statusshould say something likeahead of 'origin/a' by X commits.