fledge icon indicating copy to clipboard operation
fledge copied to clipboard

Pull as part of finalize_version()

Open krlmlr opened this issue 3 years ago • 7 comments

  • [ ] Add commit_version(pull = FALSE)
    • With pull = TRUE we would fetch always and always uncommit + commit if behind master
  • [ ] Use pull = push in finalize_version()

Only if a remote is defined.

krlmlr avatar Jul 12 '20 02:07 krlmlr

I've started working on a PR #408 but I need more info on what you mean by

With pull = TRUE we would fetch always and always uncommit + commit if behind master

If there are more commits on the remote branch

  • there might be conflicts, in that case error?
  • if not just rebase?
  • what means uncommit here? In the code there's uncommit if the last commit was a bump. Here which commits do you think should be undone, the ones from the remote?

maelle avatar Jul 26 '22 14:07 maelle

We can try the equivalent of git pull --rebase and see how this works out.

krlmlr avatar Aug 31 '22 20:08 krlmlr

there's relevant code in #408

maelle avatar Sep 01 '22 10:09 maelle

Perhaps we a higher-level wrapper around pull + bump_version() + finalize_version() ?

06cba7f1b641d654ff1b76324f109f07ba4975a0

krlmlr avatar Sep 20 '22 03:09 krlmlr

what would it be called?

Words that come to mind: update (not clear with update_news()), commit (:upside_down_face: ), sync.

maelle avatar Sep 26 '22 10:09 maelle

advance() ?

krlmlr avatar Sep 27 '22 03:09 krlmlr

Not too important, since we now have the GHA workflow.

krlmlr avatar Feb 04 '23 14:02 krlmlr