search

CirSandro / PFEE-ZAMA

A capstone project in collaboration with Zama to develop a privacy-preserving machine learning model using PPML, FHE and Concrete ML to detect banking frauds.
1 stars 1 forks source link

possible to rename old commits or too late? #26

Open CirSandro opened 2 days ago

CirSandro commented 2 days ago

-> use 'reword' instead of 'pick' in 'git rebase' Can renaming the commit be done with a branch because it is impossible to push main? Will renaming the commit accept the old CIs?

CirSandro commented 2 days ago

Personally I can't, every time I try:

Automatic merge of .gitignore
Automatic merge of README.md
CONFLICT (content): Merge conflict in README.md
error: unable to apply a238f8d... project-architecture:refactor:config files added
tip: Resolve all conflicts manually, mark them as resolved with
tip: "git add/rm <conflicted_files>", then run "git rebase --continue".
tip: You can instead skip this commit: run "git rebase --skip".
tip: To abort and get back to the state before "git rebase", run "git rebase --abort".
Unable to apply a238f8d... project-architecture:refactor:config files added

Reverts to an old version of the code that is not up to date at all, including a commit that I don't want to rename that causes conflicts in the README