Closed RealGorandos closed 2 years ago
@RealGorandos, You can't merge this branch coz of the conflicts. Most probably what you had earlier was not a bug, but you didn't have the latest branch pulled to your local machine. What you can do is
git pull origin development
git rebase/merge development
, which will merge the development into this current branch.git commit -m "Some merge conflict resolved and why merge conflict happened"
. git push origin fix....
. By default this pull request will be updated automatically (Such as in Gitlab), but if not you will need to update this pull request.
Fixed the Task component bug which was a conflict between two classes name.