pijul/pijul - Change ISF7PZQTDXWSAGRN4QY7I4ODPRPCF4NBVKUYU7K3SEJOXK33HE2QC

Resolve conflicts

Created by quickdudley on May 12, 2022

ISF7PZQTDXWSAGRN4QY7I4ODPRPCF4NBVKUYU7K3SEJOXK33HE2QC

Dependencies

In discussions

#680 Conflicts in `credit.rs`

Change contents

Resurrecting zombie bytes in pijul/src/commands/credit.rs at line 7 [5.178684]
∅:∅[4.1431] → [5.178808:178851]
B:B[5.178808] → [5.178808:178851]
BD:B[5.178808] → [5.178808:178851]
```
use libpijul::vertex_buffer::VertexBuffer;
```
Resurrecting zombie bytes in pijul/src/commands/credit.rs at line 10 [5.178684]
∅:∅[6.131] → [5.178929:178930]
∅:∅[7.2844] → [5.178929:178930]
B:B[5.178929] → [5.178929:178930]
BD:B[5.178929] → [5.178929:178930]
Resurrecting zombie bytes in pijul/src/commands/credit.rs at line 14 [5.178684]
∅:∅[4.1457] → [5.178953:178973]
B:B[5.178953] → [5.178953:178973]
BD:B[5.178953] → [5.178953:178973]
```
pub struct Credit {
```
Resurrecting zombie bytes in pijul/src/commands/credit.rs at line 16 [5.178684]
∅:∅[8.3181] → [5.178973:179038]
∅:∅[9.3410] → [5.178973:179038]
∅:∅[10.4452] → [5.178973:179038]
B:B[5.178973] → [5.178973:179038]
BD:B[5.178973] → [5.178973:179038]
```
    #[clap(long = "repository")]
    repo_path: Option<PathBuf>,
```
Resurrecting zombie bytes in pijul/src/commands/credit.rs at line 19 [5.178684]
∅:∅[10.4509] → [5.179038:179097]
B:B[5.179038] → [5.179038:179097]
BD:B[5.179038] → [5.179038:179097]
```
    #[clap(long = "channel")]
    channel: Option<String>,
```
Resurrecting zombie bytes in pijul/src/commands/credit.rs at line 22 [5.178684]
∅:∅[8.3211] → [5.179097:179133]
∅:∅[10.4551] → [5.179097:179133]
B:B[5.179097] → [5.179097:179133]
BD:B[5.179097] → [5.179097:179133]
```
    file: PathBuf,
}
impl Credit {
```
Resurrecting zombie bytes in pijul/src/commands/credit.rs at line 27 [5.178684]
∅:∅[11.2305] → [5.179185:179239]
∅:∅[12.15721] → [5.179185:179239]
B:B[5.179185] → [5.179185:179239]
BD:B[5.179185] → [5.179185:179239]
```
        let has_repo_path = self.repo_path.is_some();
```
Resurrecting zombie bytes in pijul/src/commands/credit.rs at line 37 [5.178684]
∅:∅[13.18201] → [5.179510:179547]
B:B[5.179510] → [5.179510:179547]
BD:B[5.179510] → [5.179510:179547]
```
            channel
        } else {
```
Resurrecting zombie bytes in pijul/src/commands/credit.rs at line 40 [5.178684]
∅:∅[13.18259] → [5.179682:179693]
B:B[5.179682] → [5.179682:179693]
BD:B[5.179682] → [5.179682:179693]
```
        };
```
Resurrecting zombie bytes in pijul/src/commands/credit.rs at line 42 [5.178684]
∅:∅[14.798] → [5.179828:179954]
B:B[5.179828] → [5.179828:179954]
BD:B[5.179828] → [5.179828:179954]
```
        let (pos, _ambiguous) = if has_repo_path {
            let root = std::fs::canonicalize(repo.path.join(&self.file))?;
```
Resurrecting zombie bytes in pijul/src/commands/credit.rs at line 45 [5.178684]
∅:∅[14.882] → [5.180027:180112]
B:B[5.180027] → [5.180027:180112]
BD:B[5.180027] → [5.180027:180112]
```
            txn.follow_oldest_path(&repo.changes, &channel, &path)?
        } else {
```
Resurrecting zombie bytes in pijul/src/commands/credit.rs at line 51 [5.178684]
∅:∅[15.333] → [5.180164:180243]
∅:∅[14.966] → [5.180164:180243]
B:B[5.180164] → [5.180164:180243]
BD:B[5.180164] → [5.180164:180243]
```
            txn.follow_oldest_path(&repo.changes, &channel, &path)?
        };
```
Resurrecting zombie bytes in pijul/src/commands/credit.rs at line 53 [5.178684]
B:B[16.237] → [17.1082:1111]
D:∅[16.237] → [17.1082:1111]
BD:B[16.237] → [17.1082:1111]
B:B[17.1111] → [3.308:360]
BD:B[17.1111] → [3.308:360]
```
        std::mem::drop(txn);
        super::pager(repo.config.pager.as_ref());
```
Deletion in pijul/src/commands/credit.rs at line 179 [5.178684]
B:BD[5.182879] → [3.361:361]
B:BD[5.180243] → [18.2944:2994]
BD:BD[5.180243] → [18.2944:2994]
```
        super::pager(repo.config.pager.as_ref());
```
Solving an order conflict in pijul/src/commands/credit.rs at line 179 [5.178684]
[5.182879]

Resolve conflicts

Dependencies

In discussions

Change contents

Resurrecting zombie bytes in pijul/src/commands/credit.rs at line 7 [5.178684]

Resurrecting zombie bytes in pijul/src/commands/credit.rs at line 10 [5.178684]

Resurrecting zombie bytes in pijul/src/commands/credit.rs at line 14 [5.178684]

Resurrecting zombie bytes in pijul/src/commands/credit.rs at line 16 [5.178684]

Resurrecting zombie bytes in pijul/src/commands/credit.rs at line 19 [5.178684]

Resurrecting zombie bytes in pijul/src/commands/credit.rs at line 22 [5.178684]

Resurrecting zombie bytes in pijul/src/commands/credit.rs at line 27 [5.178684]

Resurrecting zombie bytes in pijul/src/commands/credit.rs at line 37 [5.178684]

Resurrecting zombie bytes in pijul/src/commands/credit.rs at line 40 [5.178684]

Resurrecting zombie bytes in pijul/src/commands/credit.rs at line 42 [5.178684]

Resurrecting zombie bytes in pijul/src/commands/credit.rs at line 45 [5.178684]

Resurrecting zombie bytes in pijul/src/commands/credit.rs at line 51 [5.178684]

Resurrecting zombie bytes in pijul/src/commands/credit.rs at line 53 [5.178684]

Deletion in pijul/src/commands/credit.rs at line 179 [5.178684]

Solving an order conflict in pijul/src/commands/credit.rs at line 179 [5.178684]