Giter Club home page Giter Club logo

Comments (4)

riyenas0925 avatar riyenas0925 commented on June 19, 2024 1

@soimkim
I've tried a number of ways, but I'm having problems for the following reasons

case 1

advantages : There is no duplicated of commit
disadvantages : Main Branch is a previous release of changelog

To prevent duplicate commits, if you create a changelog in the develop branch and merge it into the main branch, both branches have the same changelog. However, since the changelog is created after the release has been published, this method ensures that the develop branch has the latest changelog, but the main branch has the changelog of the previous release.
스크린샷 2021-08-14 오전 12 16 29

case 2

advantages : All branches are the latest release of changelog.
disadvantages : Duplicate occurrence of commitment

If you commit the change log in both develop and master branches, it will work as follows, but the same commit will be duplicated when merged into main later.
스크린샷 2021-08-14 오전 12 00 04

case 3

This is a method of adding the changelog to the develop branch before merging in PR and then proceeding with the merge. But it failed because it was before release.

conclusion

I think it would be difficult to change the changelog without committing in the develop branch because all the methods are released in the main branch. Therefore, In the second case, if duplicate commits are displayed separately into Update Changelog on develop branch and Update Changelog on main branch, wouldn't duplication be avoided?

스크린샷 2021-08-14 오전 12 22 56

I'd like to hear from the maintainer Thank you!

from fosslight.

riyenas0925 avatar riyenas0925 commented on June 19, 2024

@soimkim
There are no conflicts, but I checked that the commits were duplicated.
I'll think of a new way to PR again. Thanks for the feedback 😄

스크린샷 2021-08-13 오후 5 48 13

from fosslight.

soimkim avatar soimkim commented on June 19, 2024

Are you saying that each commit in case 2 is left with a different commit message so it's not a duplicate commit?
That seems like the best way. 👍

from fosslight.

riyenas0925 avatar riyenas0925 commented on June 19, 2024

@soimkim
Thank you for your comments!

from fosslight.

Related Issues (20)

Recommend Projects

  • React photo React

    A declarative, efficient, and flexible JavaScript library for building user interfaces.

  • Vue.js photo Vue.js

    🖖 Vue.js is a progressive, incrementally-adoptable JavaScript framework for building UI on the web.

  • Typescript photo Typescript

    TypeScript is a superset of JavaScript that compiles to clean JavaScript output.

  • TensorFlow photo TensorFlow

    An Open Source Machine Learning Framework for Everyone

  • Django photo Django

    The Web framework for perfectionists with deadlines.

  • D3 photo D3

    Bring data to life with SVG, Canvas and HTML. 📊📈🎉

Recommend Topics

  • javascript

    JavaScript (JS) is a lightweight interpreted programming language with first-class functions.

  • web

    Some thing interesting about web. New door for the world.

  • server

    A server is a program made to process requests and deliver data to clients.

  • Machine learning

    Machine learning is a way of modeling and interpreting data that allows a piece of software to respond intelligently.

  • Game

    Some thing interesting about game, make everyone happy.

Recommend Org

  • Facebook photo Facebook

    We are working to build community through open source technology. NB: members must have two-factor auth.

  • Microsoft photo Microsoft

    Open source projects and samples from Microsoft.

  • Google photo Google

    Google ❤️ Open Source for everyone.

  • D3 photo D3

    Data-Driven Documents codes.