Skip to content

DEV Community

radin reth

Posted on Jul 22, 2021

git rebase remaining

#git

During rebase we sometimes face conflict files that need to resolve and continue one by one.

but how do we know where we are and how many steps need to resolve?

cat .git/rebase-apply/next
cat .git/rebase-apply/last
cat .git/rebase-apply/original-commit

original answer from awesome people in stackoverflow

Top comments (0)

Subscribe

Create up to 10 Postgres Databases on Neon's free plan.

If you're starting a new project, Neon has got your databases covered. No credit cards. No trials. No getting in your way.

Try Neon for Free →

Read next

Become a better tech leader by avoiding these pitfalls

Adam - Mar 7

Unveiling the Success Behind Spring Security: Open Source Business Models, Funding, and Community

Bob Cars(on) - Mar 6

Discovering Project Lombok: Simplifying Java Development Through Open Source Innovation

ashu-commits - Mar 6

Exploring GSON: A Model of Innovation Through Community, Licensing, and Corporate Support

Vitali Sorenko - Mar 6

Open for Learning <Learning /> Workplace is a second home. Everyone is your workplace are also your family members Respect them!

Location

Phnom Penh, Cambodia
Joined

Jan 7, 2021

Create up to 10 Postgres Databases on Neon's free plan.

If you're starting a new project, Neon has got your databases covered. No credit cards. No trials. No getting in your way.