I m looking at the `branch revert`

Question

I m looking at the `branch revert` and trying to do a revert but hitting an unclear error I want to rollback the last commit ideally without having to look up its specific ID Is that possible ```$ lakectl branch revert HEAD~1 Branch Are you sure you want to revert the effect of commits HEAD~1 y get commit from ref HEAD~1 not found 404 Not Found```

Robin Moffatt · Answer

also can reverts be done through the web UI I couldn t see how

Barak Amar · Answer

The HEAD is just place holder in this case try `main~1`

Robin Moffatt · Answer

```$ lakectl branch revert main~1 Branch Are you sure you want to revert the effect of commits main~1 y update branch conflict found 409 Conflict```

Barak Amar · Answer

you branch hold uncommitted changes

Robin Moffatt · Answer

no

Barak Amar · Answer

Can you share your commit log The above revert command will try to revert the change in the one commit above the latest

Barak Amar · Answer

if you are trying to revert the last commit on main use main as the last argument

Robin Moffatt · Answer

```$ lakectl log <lakefs quickstart main> ID 3c6d7270bbcec2d5c0f477b06cb143953d4aad0a24bb79981fa714d3257b8e0d Author admin Date 2023 03 15 08 25 34 +0000 UTC Merge 55f9b17656e4c2e5a1f783d14d4567d391cb4f47cf3f1cdb1e65bc51a53b8611 f6436033e20a5f0769c090f59765abf8bac3075b03541e3614f0a681acc09fa3 Merge denmark lakes into main Metadata lakefs merge strategy = default ID f6436033e20a5f0769c090f59765abf8bac3075b03541e3614f0a681acc09fa3 Author admin Date 2023 03 15 08 25 23 +0000 UTC Create a dataset of just the lakes in Denmark ID 55f9b17656e4c2e5a1f783d14d4567d391cb4f47cf3f1cdb1e65bc51a53b8611 Author admin Date 2023 03 15 08 22 19 +0000 UTC Load sample data ID 84f5331e226955df56ce810bded5ff702c4b0fae8cd2bc17d4f82736e3cfd9da Date 2023 03 15 08 22 19 +0000 UTC Repository created```

Robin Moffatt · Answer

```$ lakectl branch revert main Branch Are you sure you want to revert the effect of commits main y must specify 1 based parent number for reverting merge commit 409 Conflict``` using `main` as the last argument

Barak Amar · Answer

your main got two parents current revert will not revert a merge operation

Robin Moffatt · Answer

I don t follow sorry What s two parents mean and how can I see that from the `log` output And is it any merge that can t be reverted or just this case here with two parents

Barak Amar · Answer

Sorry I need to test my previous comment

Barak Amar · Answer

Give me a min

Robin Moffatt · Answer

thanks slightly smiling face

Barak Amar · Answer

When you revet a merge commit you need to pass which parent you like to follow ` m 1` for first parent

Barak Amar · Answer

using `main~1` should work in your case but I think you already run it and found a conflict

Barak Amar · Answer

so running revert `main m 1` will probably give the same result can you verify

Robin Moffatt · Answer

```$ lakectl branch revert main m 1 Branch Are you sure you want to revert the effect of commits main y commit main successfully reverted``` no error let me just check what it s done

Barak Amar · Answer

it should revert the changes from the merge of the first parent

Robin Moffatt · Answer

tada that s worked Thanks < Barak Amar>

Robin Moffatt · Answer

I m puzzled by this though ```ID f6436033e20a5f0769c090f59765abf8bac3075b03541e3614f0a681acc09fa3 Author admin Date 2023 03 15 08 25 23 +0000 UTC Create a dataset of just the lakes in Denmark``` this was a commit that I made in another branch so why would it show up in the log for `main`

Barak Amar · Answer

log will show all the commits based on time until the root of the repository

Barak Amar · Answer

did you merge this commit to main

Robin Moffatt · Answer

yes I did

Barak Amar · Answer

so you need to see it

Robin Moffatt · Answer

aha got it

Barak Amar · Answer

try commit on top of a new branch from main

Barak Amar · Answer

it will not be part of log from main branch