The sound distributed version control system

#290 reset generates conflict

Closed on February 1, 2021
tankf33der on February 1, 2021

Latest pijul.

$ rm -rf p1
$ pijul init p1
$ cd p1
$ touch a
$ pijul add a
$ pijul rec -am"."
Hash: Q3HC7U5LXOWRATHA4Q7LF3SWP5NZKVM5Y2JKQYHBQ63MQNYNJCKQC
$ vim a
$ cat a
1
2
3
4
5
$ pijul rec -am"."
Hash: 5JXXPD6C5Q6JNUDAR7SLC7IGQBK7JFVOV5EYKXF7J5ILOMKCVYVAC
$ vim a
$ cat a
11111111111111111
2
3
4
5555555555555
$ pijul reset
$ cat a
>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
================================
1
2
3
4
5
<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<
$
pmeunier added a change on February 1, 2021
EQLDTLXVCARE36EJE3S6SNEVTW2JJY4EYD36EX7WSIFLG2XMKKQAC
main
tankf33der on February 1, 2021

Much better, fixed.

tankf33der closed this discussion on February 1, 2021