SEARCH
PRICING
COMMUNITY
API
DOCS
INSTALL GREPPER
Log In
Signup
All Answers Tagged With reconcile
Pulling without specifying how to reconcile divergent branches is
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 #
fatal: Need to specify how to reconcile divergent branches.
reconcile def
warning: Pulling without specifying how to reconcile divergent branches is discouraged
Browse Answers By Code Lanaguage
Select a Programming Language
Shell/Bash
C#
C++
C
CSS
Html
Java
Javascript
Objective-C
PHP
Python
SQL
Swift
Whatever
Ruby
TypeScript
Go
Kotlin
Assembly
R
VBA
Scala
Rust
Dart
Elixir
Clojure
WebAssembly
F#
Erlang
Haskell
Matlab
Cobol
Fortran
Scheme
Perl
Groovy
Lua
Julia
Delphi
Abap
Lisp
Prolog
Pascal
PostScript
Smalltalk
ActionScript
BASIC
Solidity
PowerShell
GDScript
Excel
Twitter 
LinkedIn