doc: git-pull: link to new merge conflicts guide

4f434f5

Select commit

Loading

Failed to load commit list.

Uh oh!

There was an error while loading. Please reload this page.

DCO

DCO

GitGitGadget

handle_pr_comment

handle_pr_push

upstream commit

check-style on: pull_request 3

check-style

check-whitespace on: pull_request 1

check-whitespace

CI on: pull_request 60

config

win build

win+VS build

win+Meson build

osx-clang (macos-14)

osx-reftable (macos-14)

osx-gcc (macos-14)

osx-meson (macos-14)

fuzz smoke test

linux-sha256 (ubuntu:rolling)

linux-reftable (ubuntu:rolling)

linux-TEST-vars (ubuntu:20.04)

linux-breaking-changes (ubuntu:rolling)

fedora-breaking-changes-meson (fedora:latest)

linux-leaks (ubuntu:rolling)

linux-reftable-leaks (ubuntu:rolling)

linux-asan-ubsan (ubuntu:rolling)

linux-meson (ubuntu:rolling)

linux-musl-meson (alpine:latest)

linux32 (i386/ubuntu:20.04)

almalinux-8 (almalinux:8)

debian-12 (debian:12)

static-analysis

rust-analysis

sparse

documentation

win test (0)

win test (1)

win test (2)

win test (3)

win test (4)

win test (5)

win test (6)

win test (7)

win test (8)

win test (9)

win+VS test

win+Meson test (0)

win+Meson test (1)

win+Meson test (2)

win+Meson test (3)

win+Meson test (4)

win+Meson test (5)

win+Meson test (6)

win+Meson test (7)

win+Meson test (8)

win+Meson test (9)

CI on: push 90