0

I use a program that is stored as github reposity on the user (my) machine; it updates itself periodically, by just pulling (with rebase) the remote repository.

I made a change that creates conflicts frequently.

Since I don't have control on how the program executes the pull (barring create a fork, and either change the pull code, or manually pull from upstream), I was wondering if I can configure the (local) repository, so that pull --rebase executes with the strategy-optionof my choice.

Is this possible?

Marcus
  • 5,104
  • 2
  • 28
  • 24
  • 1
    Other than passing `-s` through `git pull`, no. – torek Nov 28 '22 at 03:46
  • The easiest way is to split your `git pull` command in two : run `git fetch`, followed by `git rebase origin/thatbranch` or `git rebase @{u}` (`@{u}` is short for "the upstream branch of current branch") – LeGEC Nov 28 '22 at 07:42

0 Answers0