webiny / action-conventional-commits

Ensures that all commits are following the conventional-commits standard.
50 stars 30 forks source link

feat: webapp commit message support #10

Closed 0x4007 closed 1 year ago

0x4007 commented 1 year ago

GitHub supports suggestions during the pull request review process. This process to make the change to the code, and push the commit is entirely inside of the GitHub pull request review user interface.

The default git message begins with "Update " and so we decided to add support for this on our fork.

More context is available here: https://github.com/ubiquity/ubiquity-dollar/pull/623#pullrequestreview-1378020717

Steveantor commented 1 year ago

@adrians5j how do we resolve the index.js conflict?

adrians5j commented 1 year ago

Please just resolve the merge conflict. It's just dist/build.

Whatever you do, no worries about it, I'll rebuild again before I release.

Steveantor commented 1 year ago

Please just resolve the merge conflict. It's just dist/build.

Whatever you do, no worries about it, I'll rebuild again before I release.

I'm not sure how to resolve merge conflicts of the build/transpiled files, maybe u could use git merge <target_branch> -X theirs

adrians5j commented 1 year ago

Just accept yours. It's not a problem, because I'll do a rebuild once this is merged.

0x4007 commented 1 year ago

I think that's permission to force push @Steveantor

0x4007 commented 1 year ago

Steveantor told me that @adrians5j needs to force merge and that from here its out of his hands.

adrians5j commented 1 year ago

I can't do changes in fork branches. Changes can be done only on your side.

P.S. I'm merging via GH, and it prevents me from merging b/c of a conflict.

0x4007 commented 1 year ago

I can't do changes in fork branches. Changes can be done only on your side.

You have two options:

  1. Press "." on your keyboard to edit this pull request in the browser.
  2. Or run gh pr checkout 10 locally.
Screenshot 2023-04-26 at 19 35 00

Sorry mate the road ends here with our team.

Steveantor commented 1 year ago

@adrians5j no more merge conflict

Steveantor commented 1 year ago

@adrians5j will you look into this PR again?