Public bug reported: **How to reproduce**:
1. install Ubuntu 21.04 Desktop 2. sudo apt install glances 3. man glances 4. Observe that the header contains `<<<<< HEAD =====` and two titles Image attached shows the behaviour on my machine. I'd love to submit a patch for this, but I've not contributed to an Ubuntu package before so if some one could point me to some workflow documents I'd be grateful. ❯ lsb_release -rd Description: Ubuntu 21.04 Release: 21.04 ❯ apt-cache policy glances glances: Installed: 3.1.5-1 Candidate: 3.1.5-1 Version table: *** 3.1.5-1 500 500 http://gb.archive.ubuntu.com/ubuntu hirsute/universe amd64 Packages 500 http://gb.archive.ubuntu.com/ubuntu hirsute/universe i386 Packages 100 /var/lib/dpkg/status ** Affects: glances (Ubuntu) Importance: Undecided Status: New ** Attachment added: "Screenshot from 2021-06-15 09-04-30.png" https://bugs.launchpad.net/bugs/1931985/+attachment/5504732/+files/Screenshot%20from%202021-06-15%2009-04-30.png ** Description changed: **How to reproduce**: 1. install Ubuntu 21.04 Desktop 2. sudo apt install glances 3. man glances 4. Observe that the header contains `<<<<< HEAD =====` and two titles Image attached shows the behaviour on my machine. I'd love to submit a patch for this, but I've not contributed to an Ubuntu package before so if some one could point me to some workflow documents I'd be grateful. - - ``` + ❯ lsb_release -rd Description: Ubuntu 21.04 Release: 21.04 - ``` - ``` + + ❯ apt-cache policy glances glances: - Installed: 3.1.5-1 - Candidate: 3.1.5-1 - Version table: - *** 3.1.5-1 500 - 500 http://gb.archive.ubuntu.com/ubuntu hirsute/universe amd64 Packages - 500 http://gb.archive.ubuntu.com/ubuntu hirsute/universe i386 Packages - 100 /var/lib/dpkg/status + Installed: 3.1.5-1 + Candidate: 3.1.5-1 + Version table: + *** 3.1.5-1 500 + 500 http://gb.archive.ubuntu.com/ubuntu hirsute/universe amd64 Packages + 500 http://gb.archive.ubuntu.com/ubuntu hirsute/universe i386 Packages + 100 /var/lib/dpkg/status ``` ** Description changed: **How to reproduce**: 1. install Ubuntu 21.04 Desktop 2. sudo apt install glances 3. man glances 4. Observe that the header contains `<<<<< HEAD =====` and two titles Image attached shows the behaviour on my machine. I'd love to submit a patch for this, but I've not contributed to an Ubuntu package before so if some one could point me to some workflow documents I'd be grateful. ❯ lsb_release -rd Description: Ubuntu 21.04 Release: 21.04 - ❯ apt-cache policy glances glances: Installed: 3.1.5-1 Candidate: 3.1.5-1 Version table: *** 3.1.5-1 500 500 http://gb.archive.ubuntu.com/ubuntu hirsute/universe amd64 Packages 500 http://gb.archive.ubuntu.com/ubuntu hirsute/universe i386 Packages - 100 /var/lib/dpkg/status - ``` + 100 /var/lib/dpkg/status -- You received this bug notification because you are a member of Ubuntu Bugs, which is subscribed to Ubuntu. https://bugs.launchpad.net/bugs/1931985 Title: Man page contains git merge artifacts on 21.04 To manage notifications about this bug go to: https://bugs.launchpad.net/ubuntu/+source/glances/+bug/1931985/+subscriptions -- ubuntu-bugs mailing list [email protected] https://lists.ubuntu.com/mailman/listinfo/ubuntu-bugs
