tuhaihe commented on PR #79:
URL: https://github.com/apache/cloudberry-backup/pull/79#issuecomment-4159645193
Hi, @woblerr, one minor conflict needs to be fixed to the file `.gitignore`
in the commit `Add end-to-end tests for gpbackman functionality` when rebasing
and merging this PR:
```git
~/workdir/cloudberry-backup add_gpbackman ✔
14h21m
▶ git rebase origin/main
Auto-merging .gitignore
CONFLICT (content): Merge conflict in .gitignore
error: could not apply 7c8ae66e... Add end-to-end tests for gpbackman
functionality.
hint: Resolve all conflicts manually, mark them as resolved with
hint: "git add/rm <conflicted_files>", 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 7c8ae66e... Add end-to-end tests for gpbackman functionality.
~/workdir/cloudberry-backup 80b8525a ✗
8d15h § ⚑ ✚ ⍉
▶ git status
interactive rebase in progress; onto 20d294a1
Last commands done (5 commands done):
pick 6bf6e617 Disable auto-formatting for table headers in backup-info
command.
pick 7c8ae66e Add end-to-end tests for gpbackman functionality.
(see more in file .git/rebase-merge/done)
Next commands to do (5 remaining commands):
pick a2c7a389 Fix typo in flag names and function for backup clean and
history clean commands.
pick d89f5571 Add gpbackman path setup and skip condition for old backup
version tests.
(use "git rebase --edit-todo" to view and edit)
You are currently rebasing branch 'add_gpbackman' on '20d294a1'.
(fix conflicts and then run "git rebase --continue")
(use "git rebase --skip" to skip this patch)
(use "git rebase --abort" to check out the original branch)
Changes to be committed:
(use "git restore --staged <file>..." to unstage)
modified: end_to_end/end_to_end_suite_test.go
new file: end_to_end/gpbackman_test.go
Unmerged paths:
(use "git restore --staged <file>..." to unstage)
(use "git add <file>..." to mark resolution)
both modified: .gitignore
```
```diff
▶ git diff .gitignore
diff --cc .gitignore
index 3bef3410,bf17adcd..00000000
--- a/.gitignore
+++ b/.gitignore
@@@ -27,6 -27,7 +27,14 @@@ _testmain.g
gpbackup
gprestore
gpbackup_helper
++<<<<<<< HEAD
+
+# Logs
+*.log
++||||||| parent of 7c8ae66e (Add end-to-end tests for gpbackman
functionality.)
++=======
+ gpbackman
+
+ # vscode
+ .vscode/
++>>>>>>> 7c8ae66e (Add end-to-end tests for gpbackman functionality.)
```
Could you help fix it? Thanks!
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
