| Table of Contents | ||
|---|---|---|
|
After you fork the project OpenHospital (for more infos please visit How to contributeContribution workflow), it may happen that your fork remains behind the original development, for new features or new branches as well.
In order to re-sync your fork with the original repository please follow this instructions (you need Git command line).Note:
| Info | ||
|---|---|---|
| ||
default branch is "develop", you should keep it always clean and work only on separated branches |
...
(see Contribution workflow) |
| Info | ||
|---|---|---|
| ||
if you have ongoing developments first read "Rebase your work" below |
Sync your fork
| Info | ||
|---|---|---|
| ||
Please note that GitHub already support automatic sync for forks, just look at you repo code page for the button below
After "Sync fork" is done, you can just do a |
1-- Clone your fork (you might have already cloned):
...
5-- Mind the DB - there might be new scripts in core/sql folder 😉
Rebase your work
If you was working on a new feature in a private branch on your local (good 😋), please rebase your work onto the new develop
...
git push # add --force if the branch was already pushed once, its commitcommits history is changed now ;)
...
git checkout develop
git reset --hard HEAD~3 # move develop back by 3 commits
(make sure you know how many commits you need to go back, you can scroll commit history with "git log" command and exit with "q")
...