search

bmx-ng / text.mod

Text Utilities
0 stars 3 forks source link

Updated to zsv 0.3.6.fdcd18e #13

Closed thareh closed 1 year ago

GWRon commented 1 year ago

Thanks for the efforts.

Is there any specific reason to update to "minor-release" revision? Any issues you experienced with the previous rev?

thareh commented 1 year ago

No issues with previous revision, just want to keep it up-to-date.

Tried a couple of my programs that uses zsv and they seem to be functioning correctly after this update.

thareh commented 1 year ago

Tried to make the mxml-update into it's own repository and pull request but apparently I was unsuccessful :P

GWRon commented 1 year ago

You should make these two things separate "Pull Requests" - just in case one of the changes is not "acceptible" (contains bugs, misses things ...).

Just undo the last commit and "force push" so the changes are "gone". Brucey can simply merge the PR with a "squash" (so only a single commit is merged instead of your complete commit history in your branch here.

thareh commented 1 year ago

Ah, thank you - I'll try that! :)

GWRon commented 1 year ago

when doing such things you should not "taint" your "master branch".

For each "planned Pull Request" you create a branch ...

feat_updatezsv feat_updatemxml ... in each of them you do the changes required to update the lib etc. Then you can easily create PR for each of the branches.

This is needed because this way all these branches can "base" on the same master branch revision. So do NOT branch from "feat_updatezsv" to a new branch "feat_updatemxml" as then the second branch will be based on the first branch (it so to say includes the commits from there already).

This means your master branch (the one in your fork) would correspond to the master branch of bmx-ng/text.mod ... and only your "branches" contain changes which are not existing in the original repository. If Brucey updates his repo you can simply update your main branch too (and if really needed, you can rebase your "branches" so they contain the new changes too).

If Brucey rejects your PR (maybe as he simultaneously did the same...) you can simply remove that one branch.

After he merged your PR you can then delete the no longer required "feat_xxxx" branch in your repo. Everything stays clean then - nothing "tainted".

thareh commented 1 year ago

Thanks @GWRon. I'm quite the newbie when it comes to GitHub :P