Search

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 from local/development (v1.2.5).
When I tried to update changes and commit from local/master, it tells me that everything is up-to-date, so I can't update the github/master branch.

I even put a 1.2.5 tag in local/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.

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.

Symphony • Open Source XSLT CMS

Server Requirements

  • PHP 5.3-5.6 or 7.0-7.3
  • PHP's LibXML module, with the XSLT extension enabled (--with-xsl)
  • MySQL 5.5 or above
  • An Apache or Litespeed webserver
  • Apache's mod_rewrite module or equivalent

Compatible Hosts

Sign in

Login details