search

mxcube / mxcubecore

Backend used by MXCuBE
http://mxcube.github.io/mxcube/
GNU Lesser General Public License v3.0
11 stars 52 forks source link

[WIP] P11 develop 2 #873

Closed agruzinov closed 6 months ago

agruzinov commented 6 months ago

Small changes to the P11 HO after testing.

agruzinov commented 6 months ago

Is there a cleaner way to incorporate all the changes and having a fork without having all the commits that happened in between after rebase?

For tnow it is like this:

There is a branch of core/qt under mu user. Than:

-Synchronise all the changes that happened in between with the develop branch through the web interface. Than on the develop maschine: git checkout develop git pull (with rebase)

than:

git checkout p11_develop_2 git rebase develop git push

Rhetorical question: what I'm doing wrong? :)

Or it is easier just to to work on the main repo than?

Any comments will be appreciated? Sorry for the basic question, but I think I've lost the understanding of the git behaviour.

Cheers!

git branch p11_develop_2

agruzinov commented 6 months ago

Resolved through another PR#905. Closing.