githaven-fork/options
Brecht Van Lommel 7a286e4753
Improve pull request command line instructions (#27778)
* Show checkout instructions also when there is no permission to push,
for anyone who wants to locally test the changes.
* First checkout the branch exactly as is, without immediately having to
solve merge conflicts. Leave this to the merge step, since it's often
convenient to test a change without worrying about this.
* Use `git fetch -u`, so an existing local branch is updated when
re-testing the same pull request. But not the more risky `git fetch -f`
in to handle force pushes, as we don't want to accidentally overwrite
important local changes.
* Show different merge command depending on the chosen merge style,
interactively updated.
2023-10-25 15:01:31 +00:00
..
gitignore [skip ci] Updated licenses and gitignores 2022-12-25 00:19:36 +00:00
label Add loading yaml label template files (#22976) 2023-03-02 01:44:23 +02:00
license [skip ci] Updated licenses and gitignores 2023-10-16 00:24:20 +00:00
locale Improve pull request command line instructions (#27778) 2023-10-25 15:01:31 +00:00
readme Bindata is optional and over-writable on restart (#354) 2016-12-22 19:12:23 +01:00