Difference between revisions of "Git pull -a"
Jump to navigation
Jump to search
| Line 46: | Line 46: | ||
git pull <remote> <branch> | git pull <remote> <branch> | ||
| + | |||
| + | === fatal: Need to specify how to reconcile divergent branches. === | ||
| + | hint: You have divergent branches and need to specify how to reconcile them. | ||
| + | hint: You can do so by running one of the following commands sometime before | ||
| + | hint: your next pull: | ||
| + | hint: | ||
| + | hint: git config pull.rebase false # merge | ||
| + | hint: git config pull.rebase true # rebase | ||
| + | hint: git config pull.ff only # fast-forward only | ||
| + | hint: | ||
| + | hint: You can replace "git config" with "git config --global" to set a default | ||
| + | hint: preference for all repositories. You can also pass --rebase, --no-rebase, | ||
| + | hint: or --ff-only on the command line to override the configured default per | ||
| + | hint: invocation. | ||
| + | [[fatal: Need to specify how to reconcile divergent branches.]] | ||
== Related == | == Related == | ||
Latest revision as of 12:49, 23 June 2023
Contents
Examples[edit]
git pull -a remote: Enumerating objects: 82, done. remote: Counting objects: 100% (46/46), done. remote: Compressing objects: 100% (22/22), done. remote: Total 82 (delta 25), reused 41 (delta 24), pack-reused 36 Unpacking objects: 100% (82/82), 21.44 KiB | 79.00 KiB/s, done. From github.com:your-project/your-repo * [new branch] feature/yyyyy/xxxx -> origin/feature/yyyyy/xxxx 7aeba2a..c5348fb main -> origin/main hint: Pulling without specifying how to reconcile divergent branches is hint: discouraged. You can squelch this message by running one of the following hint: commands sometime before your next pull: hint: hint: git config pull.rebase false # merge (the default strategy) hint: git config pull.rebase true # rebase hint: git config pull.ff only # fast-forward only hint: hint: You can replace "git config" with "git config --global" to set a default hint: preference for all repositories. You can also pass --rebase, --no-rebase, hint: or --ff-only on the command line to override the configured default per hint: invocation. Already up to date.
There is no tracking information for the current branch.[edit]
.../... There is no tracking information for the current branch. Please specify which branch you want to merge with. See git-pull(1) for details. git pull <remote> <branch> If you wish to set tracking information for this branch you can do so with: git branch --set-upstream-to=origin/<branch> your-current-branch
You are not currently on a branch.[edit]
git pull --all You are not currently on a branch. Please specify which branch you want to merge with. See git-pull(1) for details. git pull <remote> <branch>
fatal: Need to specify how to reconcile divergent branches.[edit]
hint: You have divergent branches and need to specify how to reconcile them. hint: You can do so by running one of the following commands sometime before hint: your next pull: hint: hint: git config pull.rebase false # merge hint: git config pull.rebase true # rebase hint: git config pull.ff only # fast-forward only hint: hint: You can replace "git config" with "git config --global" to set a default hint: preference for all repositories. You can also pass --rebase, --no-rebase, hint: or --ff-only on the command line to override the configured default per hint: invocation. fatal: Need to specify how to reconcile divergent branches.
Related[edit]
See also[edit]
Advertising:
