Hi All, Carbon 5 based Identity Server development which resided at the master branch is currently on hold and was moved out of the master branch. And the active development which was at 5.x.x branch was moved back to the master branch. So, please make sure you send any PRs to the master branch hereon.
As a result of this refactoring, the existing local master branches and the upstream master branch may conflict. To resolve that conflict follow the below steps, 1. Checkout to the master branch. 2. Backup local master branch (which has C5 based work) by creating a new branch from the master branch. (git branch c5-backup master) 3. Get a fetch from upstream (git fetch <upstream_name>) 4. Reset your local master branch to the upstream master branch (git reset --hard origin/master). Make sure you are still at the master branch when running this command. If you had any work done on top of 5.x.x branch, they won't be affected. Just commit/push them and create the PR for the master branch instead of 5.x.x branch. -- *Pulasthi Mahawithana* Associate Technical Lead WSO2 Inc., http://wso2.com/ Mobile: +94-71-5179022 <+94%2071%20517%209022> Blog: https://medium.com/@pulasthi7/ <https://wso2.com/signature>
_______________________________________________ Dev mailing list [email protected] http://wso2.org/cgi-bin/mailman/listinfo/dev
