Head's up: github change

[Thomas Russo]

The Xyce team has changed its process for sharing code on github.  The new process should simplify things on the Xyce team's side and thus it will be more likely to get updated more often.

However, this process change means that the team had to sever the old history of the project from the new commits going forward, and the master branch is now based on a new root, disconnected from the old master branch.

According to the README.md:

------------------

## Attention!!! Open source users
Due to an internal process change, the Xyce team has decided to break/restart the project history.
The master branch has been moved to track changes rooted in a new orphaned node/commit in the repository.
The new root commit is based on the final merge commit for the 7.9 release (so that there are no differences between the top of the old tree and this new root commit).
All future updates will be pushed to the re-rooted master branch.

Users may encounter the following error trying to update their repositories:\
  `fatal: refusing to merge unrelated histories`

To resolve the issue, we recommend deleting your local master branch and creating a new branch to track origin/master.  
  `git fetch`\
  `git checkout -b temp_branch`\
  `git branch -D master`\
  `git checkout master`\
  `git branch -D temp_branch`
 
To preserve a continuous view of the project history; replace the new root commit with the head of the old history.\
  `git replace <new root tag/commit id> <origin/old_master or commit id>`

We apologize for any inconvenience.
-------------

I found, however, that a simple "git pull --rebase" did the trick rather than this more involved process, and if you've already set "pull.rebase" in git config this is the default behavior.

But if you do a simple "git pull" without rebase then you may experience the errors described above, and the procedure described should get you back on track.

[Dietmar Warning]

Thanks for the information.

I made an "git pull --rebase" and got updated master and new branch "old_master". But the history in master disappears.

[Tom Russo]

Yes, that is the whole purpose of the change.  All that old history is in the "old_master" branch

--
You received this message because you are subscribed to the Google Groups "xyce-users" group.
To unsubscribe from this group and stop receiving emails from it, send an email to xyce-users+...@googlegroups.com.
To view this discussion visit https://groups.google.com/d/msgid/xyce-users/36a8e769-23e7-4b03-b79f-a3645c7cd21fn%40googlegroups.com.