GSI Forum
GSI Helmholtzzentrum für Schwerionenforschung

Home » R3BRoot » General Discussions » R3BRoot with ROOT6
Re: R3BRoot with ROOT6 [message #18443 is a reply to message #18441] Mon, 31 August 2015 13:40 Go to previous messageGo to previous message
Dmytro Kresan is currently offline  Dmytro Kresan
Messages: 166
Registered: June 2004
first-grade participant
From: *gsi.de
Hi Pablo,

It looks like your branch is completely diverged from dev branch of main repository. GitHub shows that all files have been changed. It will be impossible to make a merge later.
Have you performed the steps "Create a feature branch" and "Sync your feature branch" which are described in the workflow documentation?

This point is essential:

...
git checkout -b featureXXX mainrepo/dev
...

Feature branch is created from current dev of the main repository. Then you can add modified files and commit them.

Cheers,
Dima
 
Read Message
Read Message
Read Message
Read Message
Read Message
Read Message
Read Message
Read Message
Read Message
Read Message
Read Message
Read Message
Read Message
Read Message
Read Message
Read Message
Read Message
Read Message
Read Message
Read Message
Read Message
Read Message
Previous Topic: New version of the external packages "apr 13"
Next Topic: Reading the TTree cbmsim with R3B member functions
Goto Forum:
  


Current Time: Sat Apr 13 15:43:31 CEST 2024

Total time taken to generate the page: 0.01056 seconds