But in summary, how can I get the merge conflict to go away? I'm surprised
that the
add+commit+rebase --continue isn't enough to deal with that file.
It turned out I needed to:
2715 git add requirements.txt.m4
2716 git commit -m 'Merge conflicts' requirements.txt.m4
2717 git rebase --continue
2718 cp ../../requirements.txt.m4 requirements.txt.m4
...multiple times, after the initial git rebase.
Speculation: Could this be because there were multiple changes to that file?
We were also wondering if the 'git commit' was strictly necessary.
Thanks!
--
You received this message because you are subscribed to the Google Groups "Git
for human beings" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to git-users+unsubscr...@googlegroups.com.
To view this discussion on the web visit
https://groups.google.com/d/msgid/git-users/53a83d8c-e8c5-4073-b2f3-06c0a8cd29dfn%40googlegroups.com.
