Skip to content

README edited, yarn version updated#37

Closed
Nayananga wants to merge 1 commit intoapache:masterfrom
Nayananga:master
Closed

README edited, yarn version updated#37
Nayananga wants to merge 1 commit intoapache:masterfrom
Nayananga:master

Conversation

@Nayananga
Copy link
Copy Markdown
Contributor

Hi everyone I found that yarn version is again outdated so I updated yarn using yarn policies set-version in both antora and Hugo. Then I found ReadMe missing installing Hugo for a new site builder so I updated it and add few minor changes.

Copy link
Copy Markdown
Member

@zregvart zregvart left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for this. Can you try to make your changes on top of the master master there's a merge commit in here that I don't think was merged/rebased correctly: the static/.htaccess file should not be removed it should be there to preserve backward compatibility with the links we have published for CVEs in the past.

@zregvart
Copy link
Copy Markdown
Member

@Nayananga one tip I have for you is when you do a git pull as you're developing on the master branch in your fork is to do a git pull --rebase so to base your own changes on top of the changes done upstream.

What I usually do to help with workflow is to make the master branch track the upstream (GitHub or Apache repository) and to make my changes on a different branch that I push to my fork repository on GitHub to create the PR.

@Nayananga
Copy link
Copy Markdown
Contributor Author

Thank you Mr.Zoran for pointing out. please check now. problem was .htaccess file has accidentally ignored by me as per PhpStorm suggested. So I had to reset my fork into 3b0c20ea4fda787c80a9e3a9c30b35ac43258597 using --keep flag to protect my changes while resting then force pushed my local to remote origin master because normal push says it is already updated.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants