do the needed changes in the feature branch
git checkout feature/pagebuilder-tables-indexes $ git commit -m "fixed issues in feature-branch'
create new branch tracking master branch
$ git checkout -b feature/pagebuilder-tables-indexes-updated -t master
revert the reversion commit
find it from your git log
in linux try: 'git log | grep revert -A 5 -B 5'
commit 3037a8c49b7e8d5e83c55baee4f94f5bb32d9398 Merge: fc23c49e 6f5e1ffc Author: Mahsam Abbas syedmahsam@gmail.com Date: Wed Jul 10 23:20:54 2024 +0000
Merged in revert-pr-631 (pull request #632)
Revert "Feature/pagebuilder tables indexes (pull request #631)"$ git revert 3037a8c49b7e8d5e .... git revert -m 1 3037a8c49b7e8d5e83c55baee4f94f5bb32d9398
checkout the original feature branch
$ git checkout feature/pagebuilder-tables-indexes
merge the revert branch
$ git merge feature/pagebuilder-tables-indexes-updated
handle merge conflicts and commit and PR
You Might Also Like
Leverage Blade Control Structures Efficiently
Utilize Blade's control structures (@if, @foreach, @empty, etc.) effectively to minimize unnecessary...
Enable CSRF Protection
Laravel automatically includes CSRF protection in its forms. Ensure all your forms include the CSRF...