New comment by hsnfirdaus on void-packages repository https://github.com/void-linux/void-packages/pull/38942#issuecomment-1329055725 Comment: > ``` > git rebase master nm-openvpn > ``` @kruceter how about this message when i run it: ``` ... Rebasing (131/160618) Rebasing (132/160618) Auto-merging .gitignore CONFLICT (add/add): Merge conflict in .gitignore error: could not apply 16ae7bdf63... Added a .gitignore file to ignore default created dirs. hint: Resolve all conflicts manually, mark them as resolved with hint: "git add/rm ", then run "git rebase --continue". hint: You can instead skip this commit: run "git rebase --skip". hint: To abort and get back to the state before "git rebase", run "git rebase --abort". Could not apply 16ae7bdf63... Added a .gitignore file to ignore default created dirs. ``` When i skip it, it give smillar message to next commit rebase...