Issue template#81
Conversation
andrew-codes
left a comment
There was a problem hiding this comment.
This is excellent work! Thank you for your contribution :-)
I only have a few requested alterations.
| @@ -0,0 +1,65 @@ | |||
| # Contributor Code of Conduct | |||
There was a problem hiding this comment.
@Bennykillua , can we remove this and use the other PR (#80 ) to address this issue?
| name: '🐞 Bug Report' | ||
| about: '' | ||
| title: '[BUG] What is wrong?' | ||
| labels: ' ' |
There was a problem hiding this comment.
Does this enable automatically adding labels? If so, can we add bug and triage as auto-applied labels?
| name: 'Feature suggestion ' | ||
| about: '' | ||
| title: '[feature] What will you like to see? | ||
| labels: ' ' |
There was a problem hiding this comment.
Assuming this auto-adds labels, let's add the enhancement and triage labels to this.
|
Hi @andrew-codes The changes have been made |
There was a problem hiding this comment.
I think the removed code of conduct needs to be removed via a rebase. Otherwise, it will remove it when merged. Let me know if you want any help or guidance on how to accomplish this. Thank you again for your contributions.
I think you can use the following commands to do so:
# Fetch latest changes from all remotes
git fetch -a
# Checkout the right branch
git checkout issue-template
# Rebase the commit, 5d869190fa8e321, and forward on top of origin/main.
git rebase --onto origin/main 5d869190fa8e32105f5116bed5549db16196c054~
# Check everything looks correct and then you can force push to your branch.
git push -fThe above will update your local repo with all history. The rebase --onto will take all commits from 5d869190fa8e32105f5116bed5549db16196c054 and forward and stick them on top of origin/main for your issue-template branch. This changes the history of the branch and therefore will require a force push via git push -f.
Again, let me know if you have any questions or need any guidance. I'm happy to help. 😄
* Create CODE-OF-CONDUCT.md
920f737 to
821551f
Compare
|
Having a problem with it. Should close this comment and make another request @andrew-codes |
|
@Bennykillua , your work is there and doesn't need to be re-done, but it will require some git knowledge to clean your branch's history. I'm willing to provide the guidance. However, on the other side, the effort involved to redo the work is small. For all these reasons, I would recommend the following:
For # Open the repo in the terminal.
# This will add a new remote named upstream that points to my GitHub repo.
git add remote upstream https://github.com/andrew-codes/forecast-work.git
# Fetch latest history from all remotes (origin which is your GitHub and upstream, which points to my GitHub repo).
git fetch --all
# Create a new branch for the issue template work
git checkout -b 59-issue-template
# Now that you are on the new branch, 59-issue-template, reset it to be the same as upstream (my github)'s main branch.
git reset --hard upstream/main
# Push the new branch that is the same as my main
git push --set-upstream origin 59-issue-template
# Do work, commits for issue template only, then open a PR.I know that was a lot! Let me know if you have any questions. The same process can be done for your local main branch. It needs to be updated to have the latest changes from my upstream remote. |
|
I also have noticed some merge commits in the PRs. I'm guessing these were to update your local with my latest master. When you do a |
Working on the Issue template #81