search

linagora / esn-frontend-common-libs

Common ground for OpenPaaS frontend (https://open-paas.org)
Other
4 stars 12 forks source link

OpenPaaS-Suite/esn-frontend-calendar#218 Add block farLeft to subheader #155

Closed pbson closed 3 years ago

pbson commented 3 years ago

Resolves https://github.com/OpenPaaS-Suite/esn-frontend-calendar/issues/218.

itswillta commented 3 years ago

There is 1 weird commit:

image

You should rebase your branch from main, not merge.

pbson commented 3 years ago

There is 1 weird commit:

image

This branch is out of date, so that's the commit to update it from Github. Should I make the change to the commit message ?

itswillta commented 3 years ago

There is 1 weird commit: image

This branch is out of date, so that's the commit to update it from Github. Should I make the change to the commit message ?

The commit shouldn't exist. There should only be one commit here.

What you need to do is delete the merge commit, and then make sure you're on the esn-cal#218 branch, and run the following command:

git rebase main
itswillta commented 3 years ago

The commits are still wrong. I think we can use https://github.com/OpenPaaS-Suite/esn-frontend-common-libs/pull/157 instead.

rezk2ll commented 3 years ago

The commits are still wrong. I think we can use #157 instead.

the commits are ok, i just clicked on the update branch button to not dismiss approvals.