Skip to content

Issue template#81

Open
Bennykillua wants to merge 14 commits into
andrew-codes:mainfrom
Bennykillua:issue-template
Open

Issue template#81
Bennykillua wants to merge 14 commits into
andrew-codes:mainfrom
Bennykillua:issue-template

Conversation

@Bennykillua

@Bennykillua Bennykillua commented Oct 10, 2022

Copy link
Copy Markdown
Contributor

Working on the Issue template #81

@andrew-codes andrew-codes left a comment

Copy link
Copy Markdown
Owner

Choose a reason for hiding this comment

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

This is excellent work! Thank you for your contribution :-)

I only have a few requested alterations.

Comment thread docs/CODE-OF-CONDUCT.md
@@ -0,0 +1,65 @@
# Contributor Code of Conduct

Copy link
Copy Markdown
Owner

Choose a reason for hiding this comment

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

@Bennykillua , can we remove this and use the other PR (#80 ) to address this issue?

Comment thread .github/ISSUE_TEMPLATE/Bug-request.md Outdated
name: '🐞 Bug Report'
about: ''
title: '[BUG] What is wrong?'
labels: ' '

Copy link
Copy Markdown
Owner

Choose a reason for hiding this comment

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

Does this enable automatically adding labels? If so, can we add bug and triage as auto-applied labels?

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

Yes it does

name: 'Feature suggestion '
about: ''
title: '[feature] What will you like to see?
labels: ' '

Copy link
Copy Markdown
Owner

Choose a reason for hiding this comment

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

Assuming this auto-adds labels, let's add the enhancement and triage labels to this.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

Thanks @andrew-codes I just added it

@Bennykillua

Copy link
Copy Markdown
Contributor Author

Hi @andrew-codes The changes have been made

@andrew-codes andrew-codes left a comment

Copy link
Copy Markdown
Owner

Choose a reason for hiding this comment

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

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 -f

The 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. 😄

@Bennykillua

Copy link
Copy Markdown
Contributor Author

Having a problem with it. Should close this comment and make another request @andrew-codes

@andrew-codes

andrew-codes commented Oct 18, 2022

Copy link
Copy Markdown
Owner

@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:

  1. as a back-up, failsafe plan, I would create a new branch from my remote's main and add the work there; open a PR. Keep in mind that your local git repo is synced with your remote GitHub repo that is forked from mine; i.e., you want to update your local to the lastest master on my remote and not yours. I'll detail below how to do this for guidance.
  2. The above will get the change and PR merged. However, if you want to also learn more about git, you can use this as an opportunity to fix your branches history to be only your desired set of commits. Again, this
    isn't required because you did #1 above.

For #1 above, in order to update your local to my latest main branch:

# 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. git checkout main && git fetch --all && git reset --hard upstream/main once you have added my remote as upstream. Thanks again for all your contributions and hard work!

@andrew-codes

Copy link
Copy Markdown
Owner

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 git pull to update with latest changes, please do a git pull --rebase instead. This will put your branch's changes on top of the latest branch you are pulling from instead of creating merge commit. Let me know if I can be of any help!

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.

2 participants