[SOLVED] GitHub repository issue: commit from development, merge in master, GitHub master is behind, GitHub dev is OK
This is an open discussion with 5 replies, filed under Extensions.
Search
Merging with a branch doesn't usually require you to make a new commit, you should just be able to push local/master
to github/master
after doing your merge
Is github/master
set as the upstream for local/master
?
Try:
git branch --set-upstream master github/master
And then try pushing from master.
Thanks guys.
Pushing to from local/master
to githug/master
did the trick. I thought I have to alwayscommit before pushing ...
AFAIK that's only the case when there's a conflict that needs resolving :)
Merges will auto commit changes for you unless told not to. It' pulling that requires you to either commit or stash changes, to avoid conflicts.
Create an account or sign in to comment.
I'm having problems with Page LHandles repository.
I made some changes in
local/development
branch and committed from there (v1.2.5).Next I moved to
local/master
and merged in the changes fromlocal/development
(v1.2.5).When I tried to update changes and commit from
local/master
, it tells me that everything isup-to-date
, so I can't update thegithub/master
branch.I even put a
1.2.5
tag inlocal/master
and it was pushed correctly.Currently:
Local master : 1.2.5
Local development: 1.2.5
GitHub master: 1.2.4
GitHub development 1.2.5
Any ideas and suggestions? Pliiiiiz :)
Many thanks.