I’m brand new to git and stumbled across this issue that annoys me a

If I do some commit’s, then pulls the repository, solves a conflict or
two and then afterwards do a rebase –I HEAD~5 to reword some of my
commits before I push. The rebase will complain about conflicts and I
have to solve the same conflicts once again before I can complete the

Is there an easy way to fix these conflicts the second time, or
another way to do the rebase that won’t cause any conflicts when all I
want to do is rewording some messages?


You received this message because you are subscribed to the Google Groups "Git 
for human beings" group.
To post to this group, send email to git-users@googlegroups.com.
To unsubscribe from this group, send email to 
For more options, visit this group at 

Reply via email to