rebase in progress. Cannot commit. How to proceed or stop (abort)?
Posted by
Dharmendra Kumar, Senior Software Engineer & Co founder at MyhospitalNow
–
Step 1:
Keep going git rebase --continue
Step 2:
fix CONFLICTS then git add .
Step 3 :
Back to step 1, now if it says no changes .. then run git rebase --skip and go back to step 1
Step 4 :
If you just want to quit rebase run git rebase --abort
Step 5 :
Once all changes are done run git commit -m "rebase complete" and you are done.
Dharmendra Kumar, Senior Software Engineer & Co founder at MyhospitalNow
Experienced software developer proficient in HTML, CSS, and Bootstrap for crafting elegant and responsive user interfaces.
Skilled in Laravel and PHP, with a focus on building robust and scalable web applications.
Proficient in JavaScript for both frontend and backend development, leveraging frameworks like React and Vue.js.
Experienced in designing and consuming RESTful APIs to enable seamless communication between client and server.
Expertise in integrating payment gateways such as PayPal, Stripe, and Paytm for secure online transactions.
Familiar with Flutter, enabling the creation of natively compiled applications for mobile, web, and desktop.
Proficient in Android Studio, the primary IDE for developing Android applications.
Knowledgeable in Linux and Docker for efficient server management and application deployment.
Experienced in using Redis as an in-memory data structure store, enhancing application performance.
Passionate about staying updated with the latest technologies and continuously learning to deliver high-quality solutions.
