search

DDMAL / pixel_wrapper

Rodan Pixel.js Wrapper
Other
0 stars 1 forks source link

Merge master into develop #83

Closed PythonSemicolon closed 1 year ago

PythonSemicolon commented 1 year ago

Master was 2 commits ahead of develop

@kqct

PythonSemicolon commented 1 year ago

The 2 commits that master has ahead of develop are both commit traces from previous merges made by @softcat477. There is no difference in terms of actual code between the branches.

Since there are no concrete code changes, I will just merge my changes directly into develop. In the future, develop can be merged into master with warnings, but no issues should arise due to their content being identical.

@cadagong

softcat477 commented 1 year ago

You'll be able to merge develop branch into master branch without warning if you strictly follow the workflow:

  1. merge feature branches into develop branch.
  2. when new commits on develop branch are all good and you want to make a release, merge develop branch intomaster branch. The additional merge commits on master branch (those commits ahead of develop branch,7ee9c32 and 0c1312c) will not cause warnings or problems if you only mergedevelop intomaster, not the other way around. Additional merge commits on master are ways to track changes in each new release.

If you like clean and linear git commit history on develop and master, you find having commits on master that are ahead of the develop is irritating, and occasionally you want to merge something from master into develop(?), use something like git merge --no-ff, or there might be an option to remove the additional merge commit when you merge a pull request.

If you're lazy and want to be able to see what's going on in each release in the commit history, and if you're a big fan of having visual representations(?) to keep records of what's going on in the past, keep the additional merge commits on the master branch. That's their purpose of life.